]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD.js
Merge pull request #26 from karussell/patch-2
[rails.git] / vendor / assets / iD / iD.js
index 8ffa66d17e544cd416ab44ea22683a75800cfa90..e38326bb73d2f44b45e6e578a1a7515fed7be962 100644 (file)
   }
 
 })(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;
 };
@@ -250,17 +252,17 @@ function d3_number(x) {
 }
 
 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) {
@@ -274,16 +276,17 @@ 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;
@@ -293,17 +296,23 @@ d3.bisector = function(f) {
       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) {
@@ -425,24 +434,15 @@ d3.map = function(object) {
 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); });
@@ -453,18 +453,42 @@ d3_class(d3_Map, {
     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 = [],
@@ -570,9 +594,7 @@ d3.set = function(array) {
 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;
@@ -581,19 +603,11 @@ d3_class(d3_Set, {
     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 = {};
@@ -794,7 +808,7 @@ var d3_select = function(s, n) { return n.querySelector(s); },
 // 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;
 }
 
@@ -954,7 +968,7 @@ d3_selectionPrototype.classed = function(name, value) {
     // 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;
@@ -979,9 +993,13 @@ function d3_selection_classedRe(name) {
   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() {
@@ -1328,7 +1346,7 @@ d3_selectionPrototype.sort = function(comparator) {
 };
 
 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;
   };
@@ -1608,29 +1626,12 @@ d3.mouse = function(container) {
   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];
   }
@@ -1658,6 +1659,14 @@ function d3_sgn(x) {
   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);
 }
@@ -1756,37 +1765,37 @@ d3.behavior.zoom = function() {
 
   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);
       }
     });
   }
@@ -1862,65 +1871,65 @@ d3.behavior.zoom = function() {
     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);
@@ -1945,7 +1954,7 @@ d3.behavior.zoom = function() {
           scaleTo(view.k * 2);
           translateTo(p, l);
           d3_eventPreventDefault();
-          zoomed(event_);
+          zoomed(dispatch);
         }
         touchtime = now;
       } else if (touches.length > 1) {
@@ -1956,7 +1965,7 @@ d3.behavior.zoom = function() {
     }
 
     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) {
@@ -1977,7 +1986,7 @@ d3.behavior.zoom = function() {
 
       touchtime = null;
       translateTo(p0, l0);
-      zoomed(event_);
+      zoomed(dispatch);
     }
 
     function ended() {
@@ -1995,24 +2004,24 @@ d3.behavior.zoom = function() {
         }
       }
       // 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() {
@@ -2020,15 +2029,15 @@ d3.behavior.zoom = function() {
   }
 
   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");
@@ -2047,6 +2056,15 @@ function d3_functor(v) {
 
 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?
@@ -2257,7 +2275,6 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
         clip.lineEnd = ringEnd;
         segments = [];
         polygon = [];
-        listener.polygonStart();
       },
       polygonEnd: function() {
         clip.point = point;
@@ -2267,13 +2284,15 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
         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() {
@@ -2300,6 +2319,7 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
 
     var buffer = d3_geo_clipBufferListener(),
         ringListener = clipLine(buffer),
+        polygonStarted = false,
         polygon,
         ring;
 
@@ -2335,9 +2355,12 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
         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;
       }
 
@@ -2531,11 +2554,13 @@ function d3_geo_areaRingStart() {
     // 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.
@@ -2622,11 +2647,13 @@ function d3_geo_pointInPolygon(point, polygon) {
           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?
@@ -3218,9 +3245,9 @@ function d3_geo_clipExtent(x0, y0, x1, y1) {
         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;
         }
@@ -3228,10 +3255,6 @@ function d3_geo_clipExtent(x0, y0, x1, y1) {
       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 ||
@@ -4546,6 +4569,131 @@ function d3_geom_polygonClosed(coordinates) {
       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; };
 
@@ -4995,7 +5143,7 @@ function d3_rgb_parse(format, rgb, hsl) {
       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);
@@ -5020,22 +5168,19 @@ function d3_rgb_parse(format, rgb, hsl) {
   }
 
   /* 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);
@@ -5304,89 +5449,55 @@ function d3_interpolateNumber(a, 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;
 
@@ -5401,7 +5512,8 @@ d3.interpolators = [
     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);
   }
 ];
@@ -5664,6 +5776,7 @@ d3_transitionPrototype.ease = function(value) {
 
 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; }));
@@ -5671,6 +5784,7 @@ d3_transitionPrototype.delay = function(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; }));
@@ -5932,8 +6046,14 @@ function d3_html(request) {
 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 = [],
@@ -5980,8 +6100,12 @@ d3.combobox = function() {
                         // on mousedown
                         d3.event.stopPropagation();
                         d3.event.preventDefault();
-                        input.node().focus();
-                        fetch('', render);
+                        if (!shown) {
+                            input.node().focus();
+                            fetch('', render);
+                        } else {
+                            hide();
+                        }
                     });
             });
 
@@ -6433,14 +6557,20 @@ d3.keybinding = function(namespace) {
         // Up Arrow Key, or ↓
         '↓': 40, down: 40, 'arrow-down': 40,
         // odities, printing characters that come out wrong:
+        // Firefox Equals
+        'ffequals': 61,
         // Num-Multiply, or *
         '*': 106, star: 106, asterisk: 106, multiply: 106,
         // Num-Plus or +
         '+': 107, 'plus': 107,
         // Num-Subtract, or -
         '-': 109, subtract: 109,
+        // Firefox Minus
+        'ffplus': 171,
+        // Firefox Minus
+        'ffminus': 173,
         // Semicolon
-        ';': 186, semicolon:186,
+        ';': 186, semicolon: 186,
         // = or equals
         '=': 187, 'equals': 187,
         // Comma, or ,
@@ -6930,7 +7060,7 @@ var JXON = new (function () {
 /**
  * @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,reduce" 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
@@ -9233,6 +9363,57 @@ var JXON = new (function () {
     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`.
    *
@@ -9662,6 +9843,60 @@ var JXON = new (function () {
    */
   var pluck = map;
 
+  /**
+   * Reduces a collection to a value which is the accumulated result of running
+   * each element in the collection through the callback, where each successive
+   * callback execution consumes the return value of the previous execution. If
+   * `accumulator` is not provided the first element of the collection will be
+   * used as the initial `accumulator` value. The callback is bound to `thisArg`
+   * and invoked with four arguments; (accumulator, value, index|key, collection).
+   *
+   * @static
+   * @memberOf _
+   * @alias foldl, inject
+   * @category Collections
+   * @param {Array|Object|string} collection The collection to iterate over.
+   * @param {Function} [callback=identity] The function called per iteration.
+   * @param {*} [accumulator] Initial value of the accumulator.
+   * @param {*} [thisArg] The `this` binding of `callback`.
+   * @returns {*} Returns the accumulated value.
+   * @example
+   *
+   * var sum = _.reduce([1, 2, 3], function(sum, num) {
+   *   return sum + num;
+   * });
+   * // => 6
+   *
+   * var mapped = _.reduce({ 'a': 1, 'b': 2, 'c': 3 }, function(result, num, key) {
+   *   result[key] = num * 3;
+   *   return result;
+   * }, {});
+   * // => { 'a': 3, 'b': 6, 'c': 9 }
+   */
+  function reduce(collection, callback, accumulator, thisArg) {
+    var noaccum = arguments.length < 3;
+    callback = lodash.createCallback(callback, thisArg, 4);
+
+    if (isArray(collection)) {
+      var index = -1,
+          length = collection.length;
+
+      if (noaccum) {
+        accumulator = collection[++index];
+      }
+      while (++index < length) {
+        accumulator = callback(accumulator, collection[index], index, collection);
+      }
+    } else {
+      baseEach(collection, function(value, index, collection) {
+        accumulator = noaccum
+          ? (noaccum = false, value)
+          : callback(accumulator, value, index, collection)
+      });
+    }
+    return accumulator;
+  }
+
   /**
    * The opposite of `_.filter` this method returns the elements of a
    * collection that the callback does **not** return truey for.
@@ -10759,6 +10994,7 @@ var JXON = new (function () {
   lodash.merge = merge;
   lodash.omit = omit;
   lodash.pairs = pairs;
+  lodash.pick = pick;
   lodash.pluck = pluck;
   lodash.reject = reject;
   lodash.throttle = throttle;
@@ -10798,6 +11034,7 @@ var JXON = new (function () {
   lodash.isString = isString;
   lodash.mixin = mixin;
   lodash.noop = noop;
+  lodash.reduce = reduce;
   lodash.some = some;
   lodash.sortedIndex = sortedIndex;
 
@@ -10806,7 +11043,9 @@ var JXON = new (function () {
   lodash.any = some;
   lodash.detect = find;
   lodash.findWhere = find;
+  lodash.foldl = reduce;
   lodash.include = contains;
+  lodash.inject = reduce;
 
   forOwn(lodash, function(func, methodName) {
     if (!lodash.prototype[methodName]) {
@@ -13955,7 +14194,7 @@ module.exports = function forEach (obj, fn, ctx) {
 function rbush(maxEntries, format) {
 
     // jshint newcap: false, validthis: true
-    if (!(this instanceof rbush)) { return new rbush(maxEntries, format); }
+    if (!(this instanceof rbush)) return new rbush(maxEntries, format);
 
     // max entries in a node is 9 by default; min node fill is 40% for best performance
     this._maxEntries = Math.max(4, maxEntries || 9);
@@ -13977,32 +14216,26 @@ rbush.prototype = {
     search: function (bbox) {
 
         var node = this.data,
-            result = [];
+            result = [],
+            toBBox = this.toBBox;
 
-        if (!this._intersects(bbox, node.bbox)) { return result; }
+        if (!intersects(bbox, node.bbox)) return result;
 
         var nodesToSearch = [],
             i, len, child, childBBox;
 
         while (node) {
             for (i = 0, len = node.children.length; i < len; i++) {
-                child = node.children[i];
-                childBBox = node.leaf ? this.toBBox(child) : child.bbox;
-
-                if (this._intersects(bbox, childBBox)) {
 
-                    if (node.leaf) {
-                        result.push(child);
-
-                    } else if (this._contains(bbox, childBBox)) {
-                        this._all(child, result);
+                child = node.children[i];
+                childBBox = node.leaf ? toBBox(child) : child.bbox;
 
-                    } else {
-                        nodesToSearch.push(child);
-                    }
+                if (intersects(bbox, childBBox)) {
+                    if (node.leaf) result.push(child);
+                    else if (contains(bbox, childBBox)) this._all(child, result);
+                    else nodesToSearch.push(child);
                 }
             }
-
             node = nodesToSearch.pop();
         }
 
@@ -14010,7 +14243,7 @@ rbush.prototype = {
     },
 
     load: function (data) {
-        if (!(data && data.length)) { return this; }
+        if (!(data && data.length)) return this;
 
         if (data.length < this._minEntries) {
             for (var i = 0, len = data.length; i < len; i++) {
@@ -14020,7 +14253,7 @@ rbush.prototype = {
         }
 
         // recursively build the tree with the given data from stratch using OMT algorithm
-        var node = this._build(data.slice(), 0);
+        var node = this._build(data.slice(), 0, data.length - 1, 0);
 
         if (!this.data.children.length) {
             // save as is if tree is empty
@@ -14046,24 +14279,22 @@ rbush.prototype = {
     },
 
     insert: function (item) {
-        if (item) {
-            this._insert(item, this.data.height - 1);
-        }
+        if (item) this._insert(item, this.data.height - 1);
         return this;
     },
 
     clear: function () {
         this.data = {
             children: [],
-            leaf: true,
-            bbox: this._empty(),
-            height: 1
+            height: 1,
+            bbox: empty(),
+            leaf: true
         };
         return this;
     },
 
     remove: function (item) {
-        if (!item) { return this; }
+        if (!item) return this;
 
         var node = this.data,
             bbox = this.toBBox(item),
@@ -14093,7 +14324,7 @@ rbush.prototype = {
                 }
             }
 
-            if (!goingUp && !node.leaf && this._intersects(bbox, node.bbox)) { // go down
+            if (!goingUp && !node.leaf && contains(node.bbox, bbox)) { // go down
                 path.push(node);
                 indexes.push(i);
                 i = 0;
@@ -14105,9 +14336,7 @@ rbush.prototype = {
                 node = parent.children[i];
                 goingUp = false;
 
-            } else { // nothing found
-                node = null;
-            }
+            } else node = null; // nothing found
         }
 
         return this;
@@ -14128,29 +14357,28 @@ rbush.prototype = {
     _all: function (node, result) {
         var nodesToSearch = [];
         while (node) {
-            if (node.leaf) {
-                result.push.apply(result, node.children);
-            } else {
-                nodesToSearch.push.apply(nodesToSearch, node.children);
-            }
+            if (node.leaf) result.push.apply(result, node.children);
+            else nodesToSearch.push.apply(nodesToSearch, node.children);
+
             node = nodesToSearch.pop();
         }
         return result;
     },
 
-    _build: function (items, level, height) {
+    _build: function (items, left, right, level, height) {
 
-        var N = items.length,
+        var N = right - left + 1,
             M = this._maxEntries,
             node;
 
         if (N <= M) {
             node = {
-                children: items,
-                leaf: true,
-                height: 1
+                children: items.slice(left, right + 1),
+                height: 1,
+                bbox: null,
+                leaf: true
             };
-            this._calcBBox(node);
+            calcBBox(node, this.toBBox);
             return node;
         }
 
@@ -14160,34 +14388,37 @@ rbush.prototype = {
 
             // target number of root entries to maximize storage utilization
             M = Math.ceil(N / Math.pow(M, height - 1));
-
-            items.sort(this.compareMinX);
         }
 
         // TODO eliminate recursion?
 
         node = {
             children: [],
-            height: height
+            height: height,
+            bbox: null
         };
 
-        var N1 = Math.ceil(N / M) * Math.ceil(Math.sqrt(M)),
-            N2 = Math.ceil(N / M),
-            compare = level % 2 === 1 ? this.compareMinX : this.compareMinY,
-            i, j, slice, sliceLen, childNode;
+        var N2 = Math.ceil(N / M),
+            N1 = N2 * Math.ceil(Math.sqrt(M)),
+            i, j, right2, childNode;
 
         // split the items into M mostly square tiles
-        for (i = 0; i < N; i += N1) {
-            slice = items.slice(i, i + N1).sort(compare);
+        for (i = left; i <= right; i += N1) {
+
+            if (i + N1 <= right) partitionSort(items, i, right, i + N1, this.compareMinX);
+            right2 = Math.min(i + N1 - 1, right);
+
+            for (j = i; j <= right2; j += N2) {
+
+                if (j + N2 <= right2) partitionSort(items, j, right2, j + N2, this.compareMinY);
 
-            for (j = 0, sliceLen = slice.length; j < sliceLen; j += N2) {
                 // pack each entry recursively
-                childNode = this._build(slice.slice(j, j + N2), level + 1, height - 1);
+                childNode = this._build(items, j, Math.min(j + N2 - 1, right2), level + 1, height - 1);
                 node.children.push(childNode);
             }
         }
 
-        this._calcBBox(node);
+        calcBBox(node, this.toBBox);
 
         return node;
     },
@@ -14199,14 +14430,14 @@ rbush.prototype = {
         while (true) {
             path.push(node);
 
-            if (node.leaf || path.length - 1 === level) { break; }
+            if (node.leaf || path.length - 1 === level) break;
 
             minArea = minEnlargement = Infinity;
 
             for (i = 0, len = node.children.length; i < len; i++) {
                 child = node.children[i];
-                area = this._area(child.bbox);
-                enlargement = this._enlargedArea(bbox, child.bbox) - area;
+                area = bboxArea(child.bbox);
+                enlargement = enlargedArea(bbox, child.bbox) - area;
 
                 // choose entry with the least area enlargement
                 if (enlargement < minEnlargement) {
@@ -14229,28 +14460,26 @@ rbush.prototype = {
         return node;
     },
 
-    _insert: function (item, level, isNode, root) {
+    _insert: function (item, level, isNode) {
 
-        var bbox = isNode ? item.bbox : this.toBBox(item),
+        var toBBox = this.toBBox,
+            bbox = isNode ? item.bbox : toBBox(item),
             insertPath = [];
 
         // find the best node for accommodating the item, saving all nodes along the path too
-        var node = this._chooseSubtree(bbox, root || this.data, level, insertPath),
-            splitOccured;
+        var node = this._chooseSubtree(bbox, this.data, level, insertPath);
 
         // put the item into the node
         node.children.push(item);
-        this._extend(node.bbox, bbox);
+        extend(node.bbox, bbox);
 
         // split on node overflow; propagate upwards if necessary
-        do {
-            splitOccured = false;
+        while (level >= 0) {
             if (insertPath[level].children.length > this._maxEntries) {
                 this._split(insertPath, level);
-                splitOccured = true;
                 level--;
-            }
-        } while (level >= 0 && splitOccured);
+            } else break;
+        }
 
         // adjust bboxes along the insertion path
         this._adjustParentBBoxes(bbox, insertPath, level);
@@ -14270,26 +14499,22 @@ rbush.prototype = {
             height: node.height
         };
 
-        if (node.leaf) {
-            newNode.leaf = true;
-        }
+        if (node.leaf) newNode.leaf = true;
 
-        this._calcBBox(node);
-        this._calcBBox(newNode);
+        calcBBox(node, this.toBBox);
+        calcBBox(newNode, this.toBBox);
 
-        if (level) {
-            insertPath[level - 1].children.push(newNode);
-        } else {
-            this._splitRoot(node, newNode);
-        }
+        if (level) insertPath[level - 1].children.push(newNode);
+        else this._splitRoot(node, newNode);
     },
 
     _splitRoot: function (node, newNode) {
         // split root node
-        this.data = {};
-        this.data.children = [node, newNode];
-        this.data.height = node.height + 1;
-        this._calcBBox(this.data);
+        this.data = {
+            children: [node, newNode],
+            height: node.height + 1
+        };
+        calcBBox(this.data, this.toBBox);
     },
 
     _chooseSplitIndex: function (node, m, M) {
@@ -14299,11 +14524,11 @@ rbush.prototype = {
         minOverlap = minArea = Infinity;
 
         for (i = m; i <= M - m; i++) {
-            bbox1 = this._distBBox(node, 0, i);
-            bbox2 = this._distBBox(node, i, M);
+            bbox1 = distBBox(node, 0, i, this.toBBox);
+            bbox2 = distBBox(node, i, M, this.toBBox);
 
-            overlap = this._intersectionArea(bbox1, bbox2);
-            area = this._area(bbox1) + this._area(bbox2);
+            overlap = intersectionArea(bbox1, bbox2);
+            area = bboxArea(bbox1) + bboxArea(bbox2);
 
             // choose distribution with minimum overlap
             if (overlap < minOverlap) {
@@ -14327,17 +14552,14 @@ rbush.prototype = {
     // sorts node children by the best axis for split
     _chooseSplitAxis: function (node, m, M) {
 
-        var compareMinX = node.leaf ? this.compareMinX : this._compareNodeMinX,
-            compareMinY = node.leaf ? this.compareMinY : this._compareNodeMinY,
+        var compareMinX = node.leaf ? this.compareMinX : compareNodeMinX,
+            compareMinY = node.leaf ? this.compareMinY : compareNodeMinY,
             xMargin = this._allDistMargin(node, m, M, compareMinX),
             yMargin = this._allDistMargin(node, m, M, compareMinY);
 
         // if total distributions margin value is minimal for x, sort by minX,
         // otherwise it's already sorted by minY
-
-        if (xMargin < yMargin) {
-            node.children.sort(compareMinX);
-        }
+        if (xMargin < yMargin) node.children.sort(compareMinX);
     },
 
     // total margin of all possible split distributions where each node is at least m full
@@ -14345,116 +14567,48 @@ rbush.prototype = {
 
         node.children.sort(compare);
 
-        var leftBBox = this._distBBox(node, 0, m),
-            rightBBox = this._distBBox(node, M - m, M),
-            margin = this._margin(leftBBox) + this._margin(rightBBox),
+        var toBBox = this.toBBox,
+            leftBBox = distBBox(node, 0, m, toBBox),
+            rightBBox = distBBox(node, M - m, M, toBBox),
+            margin = bboxMargin(leftBBox) + bboxMargin(rightBBox),
             i, child;
 
         for (i = m; i < M - m; i++) {
             child = node.children[i];
-            this._extend(leftBBox, node.leaf ? this.toBBox(child) : child.bbox);
-            margin += this._margin(leftBBox);
+            extend(leftBBox, node.leaf ? toBBox(child) : child.bbox);
+            margin += bboxMargin(leftBBox);
         }
 
-        for (i = M - m - 1; i >= 0; i--) {
+        for (i = M - m - 1; i >= m; i--) {
             child = node.children[i];
-            this._extend(rightBBox, node.leaf ? this.toBBox(child) : child.bbox);
-            margin += this._margin(rightBBox);
+            extend(rightBBox, node.leaf ? toBBox(child) : child.bbox);
+            margin += bboxMargin(rightBBox);
         }
 
         return margin;
     },
 
-    // min bounding rectangle of node children from k to p-1
-    _distBBox: function (node, k, p) {
-        var bbox = this._empty();
-
-        for (var i = k, child; i < p; i++) {
-            child = node.children[i];
-            this._extend(bbox, node.leaf ? this.toBBox(child) : child.bbox);
-        }
-
-        return bbox;
-    },
-
-    // calculate node's bbox from bboxes of its children
-    _calcBBox: function (node) {
-        node.bbox = this._empty();
-
-        for (var i = 0, len = node.children.length, child; i < len; i++) {
-            child = node.children[i];
-            this._extend(node.bbox, node.leaf ? this.toBBox(child) : child.bbox);
-        }
-    },
-
     _adjustParentBBoxes: function (bbox, path, level) {
         // adjust bboxes along the given tree path
         for (var i = level; i >= 0; i--) {
-            this._extend(path[i].bbox, bbox);
+            extend(path[i].bbox, bbox);
         }
     },
 
     _condense: function (path) {
         // go through the path, removing empty nodes and updating bboxes
-        for (var i = path.length - 1, parent; i >= 0; i--) {
+        for (var i = path.length - 1, siblings; i >= 0; i--) {
             if (path[i].children.length === 0) {
                 if (i > 0) {
-                    parent = path[i - 1].children;
-                    parent.splice(parent.indexOf(path[i]), 1);
-                } else {
-                    this.clear();
-                }
-            } else {
-                this._calcBBox(path[i]);
-            }
-        }
-    },
-
-    _contains: function(a, b) {
-        return a[0] <= b[0] &&
-               a[1] <= b[1] &&
-               b[2] <= a[2] &&
-               b[3] <= a[3];
-    },
-
-    _intersects: function (a, b) {
-        return b[0] <= a[2] &&
-               b[1] <= a[3] &&
-               b[2] >= a[0] &&
-               b[3] >= a[1];
-    },
-
-    _extend: function (a, b) {
-        a[0] = Math.min(a[0], b[0]);
-        a[1] = Math.min(a[1], b[1]);
-        a[2] = Math.max(a[2], b[2]);
-        a[3] = Math.max(a[3], b[3]);
-        return a;
-    },
-
-    _area:   function (a) { return (a[2] - a[0]) * (a[3] - a[1]); },
-    _margin: function (a) { return (a[2] - a[0]) + (a[3] - a[1]); },
+                    siblings = path[i - 1].children;
+                    siblings.splice(siblings.indexOf(path[i]), 1);
 
-    _enlargedArea: function (a, b) {
-        return (Math.max(b[2], a[2]) - Math.min(b[0], a[0])) *
-               (Math.max(b[3], a[3]) - Math.min(b[1], a[1]));
-    },
-
-    _intersectionArea: function (a, b) {
-        var minX = Math.max(a[0], b[0]),
-            minY = Math.max(a[1], b[1]),
-            maxX = Math.min(a[2], b[2]),
-            maxY = Math.min(a[3], b[3]);
+                } else this.clear();
 
-        return Math.max(0, maxX - minX) *
-               Math.max(0, maxY - minY);
+            } else calcBBox(path[i], this.toBBox);
+        }
     },
 
-    _empty: function () { return [Infinity, Infinity, -Infinity, -Infinity]; },
-
-    _compareNodeMinX: function (a, b) { return a.bbox[0] - b.bbox[0]; },
-    _compareNodeMinY: function (a, b) { return a.bbox[1] - b.bbox[1]; },
-
     _initFormat: function (format) {
         // data format (minX, minY, maxX, maxY accessors)
 
@@ -14473,20 +14627,188 @@ rbush.prototype = {
     }
 };
 
-if (typeof define === 'function' && define.amd) {
-    define(function() {
-        return rbush;
-    });
-} else if (typeof module !== 'undefined') {
-    module.exports = rbush;
-} else if (typeof self !== 'undefined') {
-    self.rbush = rbush;
-} else {
-    window.rbush = rbush;
+// calculate node's bbox from bboxes of its children
+function calcBBox(node, toBBox) {
+    node.bbox = distBBox(node, 0, node.children.length, toBBox);
 }
 
-})();
-toGeoJSON = (function() {
+// min bounding rectangle of node children from k to p-1
+function distBBox(node, k, p, toBBox) {
+    var bbox = empty();
+
+    for (var i = k, child; i < p; i++) {
+        child = node.children[i];
+        extend(bbox, node.leaf ? toBBox(child) : child.bbox);
+    }
+
+    return bbox;
+}
+
+
+function empty() { return [Infinity, Infinity, -Infinity, -Infinity]; }
+
+function extend(a, b) {
+    a[0] = Math.min(a[0], b[0]);
+    a[1] = Math.min(a[1], b[1]);
+    a[2] = Math.max(a[2], b[2]);
+    a[3] = Math.max(a[3], b[3]);
+    return a;
+}
+
+function compareNodeMinX(a, b) { return a.bbox[0] - b.bbox[0]; }
+function compareNodeMinY(a, b) { return a.bbox[1] - b.bbox[1]; }
+
+function bboxArea(a)   { return (a[2] - a[0]) * (a[3] - a[1]); }
+function bboxMargin(a) { return (a[2] - a[0]) + (a[3] - a[1]); }
+
+function enlargedArea(a, b) {
+    return (Math.max(b[2], a[2]) - Math.min(b[0], a[0])) *
+           (Math.max(b[3], a[3]) - Math.min(b[1], a[1]));
+}
+
+function intersectionArea (a, b) {
+    var minX = Math.max(a[0], b[0]),
+        minY = Math.max(a[1], b[1]),
+        maxX = Math.min(a[2], b[2]),
+        maxY = Math.min(a[3], b[3]);
+
+    return Math.max(0, maxX - minX) *
+           Math.max(0, maxY - minY);
+}
+
+function contains(a, b) {
+    return a[0] <= b[0] &&
+           a[1] <= b[1] &&
+           b[2] <= a[2] &&
+           b[3] <= a[3];
+}
+
+function intersects (a, b) {
+    return b[0] <= a[2] &&
+           b[1] <= a[3] &&
+           b[2] >= a[0] &&
+           b[3] >= a[1];
+}
+
+
+function partitionSort(arr, left, right, k, compare) {
+    var pivot;
+
+    while (true) {
+        pivot = Math.floor((left + right) / 2);
+        pivot = partition(arr, left, right, pivot, compare);
+
+        if (k === pivot) break;
+        else if (k < pivot) right = pivot - 1;
+        else left = pivot + 1;
+    }
+
+    partition(arr, left, right, k, compare);
+}
+
+function partition(arr, left, right, pivot, compare) {
+    var k = left,
+        value = arr[pivot];
+
+    swap(arr, pivot, right);
+
+    for (var i = left; i < right; i++) {
+        if (compare(arr[i], value) < 0) {
+            swap(arr, k, i);
+            k++;
+        }
+    }
+    swap(arr, right, k);
+
+    return k;
+}
+
+function swap(arr, i, j) {
+    var tmp = arr[i];
+    arr[i] = arr[j];
+    arr[j] = tmp;
+}
+
+
+// export as AMD/CommonJS module or global variable
+if (typeof define === 'function' && define.amd) define(function() { return rbush; });
+else if (typeof module !== 'undefined') module.exports = rbush;
+else if (typeof self !== 'undefined') self.rbush = rbush;
+else window.rbush = rbush;
+
+})();(function(e){if("function"==typeof bootstrap)bootstrap("sexagesimal",e);else if("object"==typeof exports)module.exports=e();else if("function"==typeof define&&define.amd)define(e);else if("undefined"!=typeof ses){if(!ses.ok())return;ses.makeSexagesimal=e}else"undefined"!=typeof window?window.sexagesimal=e():global.sexagesimal=e()})(function(){var define,ses,bootstrap,module,exports;
+return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+module.exports = element;
+module.exports.pair = pair;
+module.exports.format = format;
+module.exports.formatPair = formatPair;
+
+function element(x, dims) {
+    return search(x, dims).val;
+}
+
+function formatPair(x) {
+    return format(x.lat, 'lat') + ' ' + format(x.lon, 'lon');
+}
+
+// Is 0 North or South?
+function format(x, dim) {
+    var dirs = {
+            lat: ['N', 'S'],
+            lon: ['E', 'W']
+        }[dim] || '',
+        dir = dirs[x >= 0 ? 0 : 1],
+        abs = Math.abs(x),
+        whole = Math.floor(abs),
+        fraction = abs - whole,
+        fractionMinutes = fraction * 60,
+        minutes = Math.floor(fractionMinutes),
+        seconds = Math.floor((fractionMinutes - minutes) * 60);
+
+    return whole + '° ' +
+        (minutes ? minutes + "' " : '') +
+        (seconds ? seconds + '" ' : '') + dir;
+}
+
+function search(x, dims, r) {
+    if (!dims) dims = 'NSEW';
+    if (typeof x !== 'string') return { val: null, regex: r };
+    r = r || /[\s\,]*([\-|\—|\―]?[0-9.]+)°? *(?:([0-9.]+)['’′‘] *)?(?:([0-9.]+)(?:''|"|”|″) *)?([NSEW])?/gi;
+    var m = r.exec(x);
+    if (!m) return { val: null, regex: r };
+    else if (m[4] && dims.indexOf(m[4]) === -1) return { val: null, regex: r };
+    else return {
+        val: (((m[1]) ? parseFloat(m[1]) : 0) +
+            ((m[2] ? parseFloat(m[2]) / 60 : 0)) +
+            ((m[3] ? parseFloat(m[3]) / 3600 : 0))) *
+            ((m[4] && m[4] === 'S' || m[4] === 'W') ? -1 : 1),
+        regex: r,
+        raw: m[0],
+        dim: m[4]
+    };
+}
+
+function pair(x, dims) {
+    x = x.trim();
+    var one = search(x, dims);
+    if (one.val === null) return null;
+    var two = search(x, dims, one.regex);
+    if (two.val === null) return null;
+    // null if one/two are not contiguous.
+    if (one.raw + two.raw !== x) return null;
+    if (one.dim) return swapdim(one.val, two.val, one.dim);
+    else return [one.val, two.val];
+}
+
+function swapdim(a, b, dim) {
+    if (dim == 'N' || dim == 'S') return [a, b];
+    if (dim == 'W' || dim == 'E') return [b, a];
+}
+
+},{}]},{},[1])
+(1)
+});
+;toGeoJSON = (function() {
     'use strict';
 
     var removeSpace = (/\s*/g),
@@ -16038,52 +16360,7 @@ window.iD = function () {
     };
 
     /* 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);
@@ -16151,7 +16428,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.3.9';
+iD.version = '1.6.2';
 
 (function() {
     var detected = {};
@@ -16185,6 +16462,44 @@ iD.version = '1.3.9';
 
     iD.detect = function() { return detected; };
 })();
+iD.countryCode  = function() {
+    var countryCode = {},
+        endpoint = 'https://nominatim.openstreetmap.org/reverse?';
+
+    if (!iD.countryCode.cache) {
+        iD.countryCode.cache = rbush();
+    }
+
+    var cache = iD.countryCode.cache;
+
+    countryCode.search = function(location, callback) {
+        var countryCodes = cache.search([location[0], location[1], location[0], location[1]]);
+
+        if (countryCodes.length > 0)
+            return callback(null, countryCodes[0][4]);
+
+        d3.json(endpoint +
+            iD.util.qsString({
+                format: 'json',
+                addressdetails: 1,
+                lat: location[1],
+                lon: location[0]
+            }), function(err, result) {
+                if (err)
+                    return callback(err);
+                else if (result && result.error)
+                    return callback(result.error);
+
+                var extent = iD.geo.Extent(location).padByMeters(1000);
+
+                cache.insert([extent[0][0], extent[0][1], extent[1][0], extent[1][1], result.address.country_code]);
+
+                callback(null, result.address.country_code);
+            });
+    };
+
+    return countryCode;
+};
 iD.taginfo = function() {
     var taginfo = {},
         endpoint = 'https://taginfo.openstreetmap.org/api/4/',
@@ -16273,7 +16588,7 @@ iD.taginfo = function() {
 
     taginfo.keys = function(parameters, callback) {
         var debounce = parameters.debounce;
-        parameters = clean(shorten(setSort(setFilter(parameters))));
+        parameters = clean(shorten(setSort(parameters)));
         request(endpoint + 'keys/all?' +
             iD.util.qsString(_.extend({
                 rp: 10,
@@ -16425,7 +16740,11 @@ iD.util.stringQs = function(str) {
 };
 
 iD.util.qsString = function(obj, noencode) {
-    function softEncode(s) { return s.replace('&', '%26'); }
+    function softEncode(s) {
+      // encode everything except special characters used in certain hash parameters:
+      // "/" in map states, ":", ",", {" and "}" in background
+      return encodeURIComponent(s).replace(/(%2F|%3A|%2C|%7B|%7D)/g, decodeURIComponent);
+    }
     return Object.keys(obj).sort().map(function(key) {
         return encodeURIComponent(key) + '=' + (
             noencode ? softEncode(obj[key]) : encodeURIComponent(obj[key]));
@@ -16622,16 +16941,50 @@ iD.geo.interp = function(p1, p2, t) {
             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];
     return Math.sqrt((x * x) + (y * y));
 };
+
+// using WGS84 polar radius (6356752.314245179 m)
+// const = 2 * PI * r / 360
+iD.geo.latToMeters = function(dLat) {
+    return dLat * 110946.257617;
+};
+
+// using WGS84 equatorial radius (6378137.0 m)
+// const = 2 * PI * r / 360
+iD.geo.lonToMeters = function(dLon, atLat) {
+    return Math.abs(atLat) >= 90 ? 0 :
+        dLon * 111319.490793 * Math.abs(Math.cos(atLat * (Math.PI/180)));
+};
+
+// using WGS84 polar radius (6356752.314245179 m)
+// const = 2 * PI * r / 360
+iD.geo.metersToLat = function(m) {
+    return m / 110946.257617;
+};
+
+// using WGS84 equatorial radius (6378137.0 m)
+// const = 2 * PI * r / 360
+iD.geo.metersToLon = function(m, atLat) {
+    return Math.abs(atLat) >= 90 ? 0 :
+        m / 111319.490793 / Math.abs(Math.cos(atLat * (Math.PI/180)));
+};
+
 // Equirectangular approximation of spherical distances on Earth
 iD.geo.sphericalDistance = function(a, b) {
-    var x = Math.cos(a[1]*Math.PI/180) * (a[0] - b[0]),
-        y = a[1] - b[1];
-    return 6.3710E6 * Math.sqrt((x * x) + (y * y)) * Math.PI/180;
+    var x = iD.geo.lonToMeters(a[0] - b[0], (a[1] + b[1]) / 2),
+        y = iD.geo.latToMeters(a[1] - b[1]);
+    return Math.sqrt((x * x) + (y * y));
 };
 
 iD.geo.edgeEqual = function(a, b) {
@@ -16639,6 +16992,14 @@ iD.geo.edgeEqual = function(a, b) {
         (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
@@ -16685,6 +17046,39 @@ iD.geo.chooseEdge = function(nodes, point, projection) {
     };
 };
 
+// Return the intersection point of 2 line segments.
+// From https://github.com/pgkelley4/line-segments-intersect
+// This uses the vector cross product approach described below:
+//  http://stackoverflow.com/a/565282/786339
+iD.geo.lineIntersection = function(a, b) {
+    function subtractPoints(point1, point2) {
+        return [point1[0] - point2[0], point1[1] - point2[1]];
+    }
+    function crossProduct(point1, point2) {
+        return point1[0] * point2[1] - point1[1] * point2[0];
+    }
+
+    var p = [a[0][0], a[0][1]],
+        p2 = [a[1][0], a[1][1]],
+        q = [b[0][0], b[0][1]],
+        q2 = [b[1][0], b[1][1]],
+        r = subtractPoints(p2, p),
+        s = subtractPoints(q2, q),
+        uNumerator = crossProduct(subtractPoints(q, p), r),
+        denominator = crossProduct(r, s);
+
+    if (uNumerator && denominator) {
+        var u = uNumerator / denominator,
+            t = crossProduct(subtractPoints(q, p), s) / denominator;
+
+        if ((t >= 0) && (t <= 1) && (u >= 0) && (u <= 1)) {
+            return iD.geo.interp(p, p2, t);
+        }
+    }
+
+    return null;
+};
+
 // Return whether point is contained in polygon.
 //
 // `point` should be a 2-item array of coordinates.
@@ -16718,9 +17112,20 @@ iD.geo.polygonContainsPolygon = function(outer, inner) {
 };
 
 iD.geo.polygonIntersectsPolygon = function(outer, inner) {
+    function testSegments(outer, inner) {
+        for (var i = 0; i < outer.length - 1; i++) {
+            for (var j = 0; j < inner.length - 1; j++) {
+                var a = [ outer[i], outer[i+1] ],
+                    b = [ inner[j], inner[j+1] ];
+                if (iD.geo.lineIntersection(a, b)) return true;
+            }
+        }
+        return false;
+    }
+
     return _.some(inner, function(point) {
         return iD.geo.pointInPolygon(point, outer);
-    });
+    }) || testSegments(outer, inner);
 };
 
 iD.geo.pathLength = function(path) {
@@ -16746,7 +17151,7 @@ iD.geo.Extent = function geoExtent(min, max) {
     }
 };
 
-iD.geo.Extent.prototype = [[], []];
+iD.geo.Extent.prototype = new Array(2);
 
 _.extend(iD.geo.Extent.prototype, {
     extend: function(obj) {
@@ -16757,6 +17162,13 @@ _.extend(iD.geo.Extent.prototype, {
                               Math.max(obj[1][1], this[1][1])]);
     },
 
+    _extend: function(extent) {
+        this[0][0] = Math.min(extent[0][0], this[0][0]);
+        this[0][1] = Math.min(extent[0][1], this[0][1]);
+        this[1][0] = Math.max(extent[1][0], this[1][0]);
+        this[1][1] = Math.max(extent[1][1], this[1][1]);
+    },
+
     area: function() {
         return Math.abs((this[1][0] - this[0][0]) * (this[1][1] - this[0][1]));
     },
@@ -16792,9 +17204,21 @@ _.extend(iD.geo.Extent.prototype, {
                                   Math.min(obj[1][1], this[1][1])]);
     },
 
+    percentContainedIn: function(obj) {
+        if (!(obj instanceof iD.geo.Extent)) obj = new iD.geo.Extent(obj);
+        var a1 = this.intersection(obj).area(),
+            a2 = this.area();
+
+        if (a1 === Infinity || a2 === Infinity || a1 === 0 || a2 === 0) {
+            return 0;
+        } else {
+            return a1 / a2;
+        }
+    },
+
     padByMeters: function(meters) {
-        var dLat = meters / 111200,
-            dLon = meters / 111200 / Math.abs(Math.cos(this.center()[1]));
+        var dLat = iD.geo.metersToLat(meters),
+            dLon = iD.geo.metersToLon(meters, this.center()[1]);
         return iD.geo.Extent(
                 [this[0][0] - dLon, this[0][1] - dLat],
                 [this[1][0] + dLon, this[1][1] + dLat]);
@@ -16803,7 +17227,158 @@ _.extend(iD.geo.Extent.prototype, {
     toParam: function() {
         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(graph, from, via, to, projection) {
+    var fromWay = graph.entity(from.way),
+        fromNode = graph.entity(from.node),
+        toWay = graph.entity(to.way),
+        toNode = graph.entity(to.node),
+        viaNode = graph.entity(via.node),
+        fromOneWay = (fromWay.tags.oneway === 'yes' && fromWay.last() === via.node) ||
+            (fromWay.tags.oneway === '-1' && fromWay.first() === via.node),
+        toOneWay = (toWay.tags.oneway === 'yes' && toWay.first() === via.node) ||
+            (toWay.tags.oneway === '-1' && toWay.last() === via.node),
+        angle = iD.geo.angle(viaNode, fromNode, projection) -
+                iD.geo.angle(viaNode, toNode, projection);
+
+    angle = angle * 180 / Math.PI;
+
+    while (angle < 0)
+        angle += 360;
+
+    if (fromNode === toNode)
+        return 'no_u_turn';
+    if ((angle < 23 || angle > 336) && fromOneWay && toOneWay)
+        return 'no_u_turn';
+    if (angle < 158)
+        return 'no_right_turn';
+    if (angle > 202)
+        return 'no_left_turn';
+
+    return 'no_straight_on';
+};
 // 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) {
@@ -16939,67 +17514,55 @@ iD.geo.joinWays = function(array, 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) {
@@ -17092,12 +17655,17 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
     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;
@@ -17118,16 +17686,19 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
 
         // 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;
@@ -17135,6 +17706,7 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
 
             // 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];
@@ -17146,7 +17718,7 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
             totalAngle = endAngle - startAngle;
 
             // detects looping around -pi/pi
-            if (totalAngle*sign > 0) {
+            if (totalAngle * sign > 0) {
                 totalAngle = -sign * (2 * Math.PI - Math.abs(totalAngle));
             }
 
@@ -17177,7 +17749,40 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
                 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
@@ -17190,6 +17795,38 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
         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';
@@ -17241,7 +17878,15 @@ iD.actions.Connect = function(nodeIds) {
 };
 iD.actions.DeleteMember = function(relationId, memberIndex) {
     return function(graph) {
-        return graph.replace(graph.entity(relationId).removeMember(memberIndex));
+        var relation = graph.entity(relationId)
+            .removeMember(memberIndex);
+
+        graph = graph.replace(relation);
+
+        if (relation.isDegenerate())
+            graph = iD.actions.DeleteRelation(relation.id)(graph);
+
+        return graph;
     };
 };
 iD.actions.DeleteMultiple = function(ids) {
@@ -17971,6 +18616,90 @@ iD.actions.Orthogonalize = function(wayId, projection) {
 
     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
+// iD.geo.inferRestriction.
+//
+// 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,
+                        turn.from,
+                        turn.via,
+                        turn.to,
+                        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
@@ -18345,6 +19074,29 @@ iD.actions.Straighten = function(wayId, projection) {
 
     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'),
@@ -18475,6 +19227,9 @@ iD.behavior.drag = function() {
             var p = point(),
                 dx = p[0] - origin_[0],
                 dy = p[1] - origin_[1];
+            
+            if (dx === 0 && dy === 0)
+                return;
 
             if (!started) {
                 started = true;
@@ -18674,7 +19429,7 @@ iD.behavior.Draw = function(context) {
         context.install(hover);
         context.install(edit);
 
-        if (!iD.behavior.Draw.usedTails[tail.text()]) {
+        if (!context.inIntro() && !iD.behavior.Draw.usedTails[tail.text()]) {
             context.install(tail);
         }
 
@@ -18698,7 +19453,7 @@ iD.behavior.Draw = function(context) {
         context.uninstall(hover);
         context.uninstall(edit);
 
-        if (!iD.behavior.Draw.usedTails[tail.text()]) {
+        if (!context.inIntro() && !iD.behavior.Draw.usedTails[tail.text()]) {
             context.uninstall(tail);
             iD.behavior.Draw.usedTails[tail.text()] = true;
         }
@@ -18951,15 +19706,29 @@ iD.behavior.Hash = function(context) {
     };
 
     var formatter = function(map) {
-        var center = map.center(),
+        var mode = context.mode(),
+            center = map.center(),
             zoom = map.zoom(),
-            precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
-        var q = iD.util.stringQs(location.hash.substring(1));
-        return '#' + iD.util.qsString(_.assign(q, {
-                map: zoom.toFixed(2) +
-                    '/' + center[0].toFixed(precision) +
-                    '/' + center[1].toFixed(precision)
-            }), true);
+            precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)),
+            q = _.omit(iD.util.stringQs(location.hash.substring(1)), 'comment'),
+            newParams = {};
+
+        if (mode && mode.id === 'browse') {
+            delete q.id;
+        } else {
+            var selected = context.selectedIDs().filter(function(id) {
+                return !context.entity(id).isNew();
+            });
+            if (selected.length) {
+                newParams.id = selected.join(',');
+            }
+        }
+
+        newParams.map = zoom.toFixed(2) +
+                '/' + center[0].toFixed(precision) +
+                '/' + center[1].toFixed(precision);
+
+        return '#' + iD.util.qsString(_.assign(q, newParams), true);
     };
 
     function update() {
@@ -18967,7 +19736,7 @@ iD.behavior.Hash = function(context) {
         if (s0 !== s1) location.replace(s0 = s1); // don't recenter the map!
     }
 
-    var move = _.throttle(update, 500);
+    var throttledUpdate = _.throttle(update, 500);
 
     function hashchange() {
         if (location.hash === s0) return; // ignore spurious hashchange events
@@ -18978,14 +19747,18 @@ iD.behavior.Hash = function(context) {
 
     function hash() {
         context.map()
-            .on('move.hash', move);
+            .on('move.hash', throttledUpdate);
+
+        context
+            .on('enter.hash', throttledUpdate);
 
         d3.select(window)
             .on('hashchange.hash', hashchange);
 
         if (location.hash) {
             var q = iD.util.stringQs(location.hash.substring(1));
-            if (q.id) context.loadEntity(q.id, !q.map);
+            if (q.id) context.loadEntity(q.id.split(',')[0], !q.map);
+            if (q.comment) context.storage('comment', q.comment);
             hashchange();
             if (q.map) hash.hadHash = true;
         }
@@ -18995,6 +19768,9 @@ iD.behavior.Hash = function(context) {
         context.map()
             .on('move.hash', null);
 
+        context
+            .on('enter.hash', null);
+
         d3.select(window)
             .on('hashchange.hash', null);
 
@@ -19148,8 +19924,6 @@ iD.behavior.Lasso = function(context) {
                     .on('mouseup.lasso', mouseup);
 
                 d3.event.stopPropagation();
-                d3.event.preventDefault();
-
             }
         }
 
@@ -19532,8 +20306,7 @@ iD.modes.Browse = function(context) {
         button: 'browse',
         id: 'browse',
         title: t('modes.browse.title'),
-        description: t('modes.browse.description'),
-        key: '1'
+        description: t('modes.browse.description')
     }, sidebar;
 
     var behaviors = [
@@ -20099,7 +20872,7 @@ iD.modes.Save = function(context) {
                     confirm
                         .select('.modal-section.message-text')
                         .append('p')
-                        .text(err.responseText);
+                        .text(err.responseText || t('save.unknown_error_details'));
                 } else {
                     context.flush();
                     success(e, changeset_id);
@@ -20244,17 +21017,6 @@ iD.modes.Select = function(context, selectedIDs) {
             });
         });
 
-        var notNew = selectedIDs.filter(function(id) {
-            return !context.entity(id).isNew();
-        });
-
-        if (notNew.length) {
-            var q = iD.util.stringQs(location.hash.substring(1));
-            location.replace('#' + iD.util.qsString(_.assign(q, {
-                id: notNew.join(',')
-            }), true));
-        }
-
         context.ui().sidebar
             .select(singular() ? singular().id : null, newFeature);
 
@@ -20338,9 +21100,6 @@ iD.modes.Select = function(context, selectedIDs) {
             context.uninstall(behavior);
         });
 
-        var q = iD.util.stringQs(location.hash.substring(1));
-        location.replace('#' + iD.util.qsString(_.omit(q, 'id'), true));
-
         keybinding.off();
 
         context.history()
@@ -20362,6 +21121,8 @@ iD.modes.Select = function(context, selectedIDs) {
 iD.operations = {};
 iD.operations.Circularize = function(selectedIDs, context) {
     var entityId = selectedIDs[0],
+        entity = context.entity(entityId),
+        extent = entity.extent(context.graph()),
         geometry = context.geometry(entityId),
         action = iD.actions.Circularize(entityId, context.projection);
 
@@ -20372,21 +21133,16 @@ iD.operations.Circularize = function(selectedIDs, context) {
 
     operation.available = function() {
         return selectedIDs.length === 1 &&
-            context.entity(entityId).type === 'way';
+            entity.type === 'way' &&
+            _.uniq(entity.nodes).length > 1;
     };
 
     operation.disabled = function() {
-        var way = context.entity(entityId),
-            wayExtent = way.extent(context.graph()),
-            mapExtent = context.extent(),
-            intersection = mapExtent.intersection(wayExtent),
-            pctVisible = intersection.area() / wayExtent.area();
-
-        if (pctVisible < 0.8) {
-            return 'too_large';
-        } else {
-            return action.disabled(context.graph());
+        var reason;
+        if (extent.percentContainedIn(context.extent()) < 0.8) {
+            reason = 'too_large';
         }
+        return action.disabled(context.graph()) || reason;
     };
 
     operation.tooltip = function() {
@@ -20489,15 +21245,15 @@ iD.operations.Delete = function(selectedIDs, context) {
             }
         }
 
-        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() {
@@ -20614,6 +21370,10 @@ iD.operations.Merge = function(selectedIDs, context) {
     return operation;
 };
 iD.operations.Move = function(selectedIDs, context) {
+    var extent = selectedIDs.reduce(function(extent, id) {
+            return extent.extend(context.entity(id).extent(context.graph()));
+        }, iD.geo.Extent());
+
     var operation = function() {
         context.enter(iD.modes.Move(context, selectedIDs));
     };
@@ -20624,8 +21384,11 @@ iD.operations.Move = function(selectedIDs, context) {
     };
 
     operation.disabled = function() {
-        return iD.actions.Move(selectedIDs)
-            .disabled(context.graph());
+        var reason;
+        if (extent.area() && extent.percentContainedIn(context.extent()) < 0.8) {
+            reason = 'too_large';
+        }
+        return iD.actions.Move(selectedIDs).disabled(context.graph()) || reason;
     };
 
     operation.tooltip = function() {
@@ -20643,16 +21406,17 @@ iD.operations.Move = function(selectedIDs, context) {
 };
 iD.operations.Orthogonalize = function(selectedIDs, context) {
     var entityId = selectedIDs[0],
+        entity = context.entity(entityId),
+        extent = entity.extent(context.graph()),
         geometry = context.geometry(entityId),
         action = iD.actions.Orthogonalize(entityId, context.projection);
 
-    function operation() {
+    var operation = function() {
         var annotation = t('operations.orthogonalize.annotation.' + geometry);
         context.perform(action, annotation);
-    }
+    };
 
     operation.available = function() {
-        var entity = context.entity(entityId);
         return selectedIDs.length === 1 &&
             entity.type === 'way' &&
             entity.isClosed() &&
@@ -20660,17 +21424,11 @@ iD.operations.Orthogonalize = function(selectedIDs, context) {
     };
 
     operation.disabled = function() {
-        var way = context.entity(entityId),
-            wayExtent = way.extent(context.graph()),
-            mapExtent = context.extent(),
-            intersection = mapExtent.intersection(wayExtent),
-            pctVisible = intersection.area() / wayExtent.area();
-
-        if (pctVisible < 0.8) {
-            return 'too_large';
-        } else {
-            return action.disabled(context.graph());
+        var reason;
+        if (extent.percentContainedIn(context.extent()) < 0.8) {
+            reason = 'too_large';
         }
+        return action.disabled(context.graph()) || reason;
     };
 
     operation.tooltip = function() {
@@ -20715,33 +21473,39 @@ iD.operations.Reverse = function(selectedIDs, context) {
     return operation;
 };
 iD.operations.Rotate = function(selectedIDs, context) {
-    var entityId = selectedIDs[0];
+    var entityId = selectedIDs[0],
+        entity = context.entity(entityId),
+        extent = entity.extent(context.graph()),
+        geometry = context.geometry(entityId);
 
     var operation = function() {
         context.enter(iD.modes.RotateWay(context, entityId));
     };
 
     operation.available = function() {
-        var graph = context.graph(),
-            entity = graph.entity(entityId);
-
-        if (selectedIDs.length !== 1 ||
-            entity.type !== 'way')
+        if (selectedIDs.length !== 1 || entity.type !== 'way')
             return false;
-        if (context.geometry(entityId) === 'area')
+        if (geometry === 'area')
             return true;
         if (entity.isClosed() &&
-            graph.parentRelations(entity).some(function(r) { return r.isMultipolygon(); }))
+            context.graph().parentRelations(entity).some(function(r) { return r.isMultipolygon(); }))
             return true;
         return false;
     };
 
     operation.disabled = function() {
-        return false;
+        if (extent.percentContainedIn(context.extent()) < 0.8) {
+            return 'too_large';
+        } else {
+            return false;
+        }
     };
 
     operation.tooltip = function() {
-        return t('operations.rotate.description');
+        var disable = operation.disabled();
+        return disable ?
+            t('operations.rotate.' + disable) :
+            t('operations.rotate.description');
     };
 
     operation.id = 'rotate';
@@ -20848,8 +21612,10 @@ iD.areaKeys = {
         "atm": true,
         "bbq": true,
         "bench": true,
+        "bureau_de_change": true,
         "clock": true,
         "drinking_water": true,
+        "parking_entrance": true,
         "post_box": true,
         "telephone": true,
         "vending_machine": true,
@@ -20886,6 +21652,7 @@ iD.areaKeys = {
     "landuse": {},
     "leisure": {
         "picnic_table": true,
+        "track": true,
         "slipway": true
     },
     "man_made": {
@@ -21000,7 +21767,7 @@ iD.areaKeys = {
         var elems = obj.getElementsByTagName(ndStr),
             nodes = new Array(elems.length);
         for (var i = 0, l = elems.length; i < l; i++) {
-            nodes[i] = 'n' + elems[i].attributes.ref.nodeValue;
+            nodes[i] = 'n' + elems[i].attributes.ref.value;
         }
         return nodes;
     }
@@ -21010,7 +21777,7 @@ iD.areaKeys = {
             tags = {};
         for (var i = 0, l = elems.length; i < l; i++) {
             var attrs = elems[i].attributes;
-            tags[attrs.k.nodeValue] = attrs.v.nodeValue;
+            tags[attrs.k.value] = attrs.v.value;
         }
         return tags;
     }
@@ -21021,9 +21788,9 @@ iD.areaKeys = {
         for (var i = 0, l = elems.length; i < l; i++) {
             var attrs = elems[i].attributes;
             members[i] = {
-                id: attrs.type.nodeValue[0] + attrs.ref.nodeValue,
-                type: attrs.type.nodeValue,
-                role: attrs.role.nodeValue
+                id: attrs.type.value[0] + attrs.ref.value,
+                type: attrs.type.value,
+                role: attrs.role.value
             };
         }
         return members;
@@ -21033,10 +21800,10 @@ iD.areaKeys = {
         node: function nodeData(obj) {
             var attrs = obj.attributes;
             return new iD.Node({
-                id: iD.Entity.id.fromOSM(nodeStr, attrs.id.nodeValue),
-                loc: [parseFloat(attrs.lon.nodeValue), parseFloat(attrs.lat.nodeValue)],
-                version: attrs.version.nodeValue,
-                user: attrs.user && attrs.user.nodeValue,
+                id: iD.Entity.id.fromOSM(nodeStr, attrs.id.value),
+                loc: [parseFloat(attrs.lon.value), parseFloat(attrs.lat.value)],
+                version: attrs.version.value,
+                user: attrs.user && attrs.user.value,
                 tags: getTags(obj)
             });
         },
@@ -21044,9 +21811,9 @@ iD.areaKeys = {
         way: function wayData(obj) {
             var attrs = obj.attributes;
             return new iD.Way({
-                id: iD.Entity.id.fromOSM(wayStr, attrs.id.nodeValue),
-                version: attrs.version.nodeValue,
-                user: attrs.user && attrs.user.nodeValue,
+                id: iD.Entity.id.fromOSM(wayStr, attrs.id.value),
+                version: attrs.version.value,
+                user: attrs.user && attrs.user.value,
                 tags: getTags(obj),
                 nodes: getNodes(obj)
             });
@@ -21055,9 +21822,9 @@ iD.areaKeys = {
         relation: function relationData(obj) {
             var attrs = obj.attributes;
             return new iD.Relation({
-                id: iD.Entity.id.fromOSM(relationStr, attrs.id.nodeValue),
-                version: attrs.version.nodeValue,
-                user: attrs.user && attrs.user.nodeValue,
+                id: iD.Entity.id.fromOSM(relationStr, attrs.id.value),
+                version: attrs.version.value,
+                user: attrs.user && attrs.user.value,
                 tags: getTags(obj),
                 members: getMembers(obj)
             });
@@ -21135,7 +21902,7 @@ iD.areaKeys = {
 
     connection.changesetTags = function(comment, imageryUsed) {
         var tags = {
-            imagery_used: imageryUsed.join(';'),
+            imagery_used: imageryUsed.join(';').substr(0, 255),
             created_by: 'iD ' + iD.version
         };
 
@@ -21191,9 +21958,9 @@ iD.areaKeys = {
             }
 
             userDetails = {
-                display_name: u.attributes.display_name.nodeValue,
+                display_name: u.attributes.display_name.value,
                 image_url: image_url,
-                id: u.attributes.id.nodeValue
+                id: u.attributes.id.value
             };
 
             callback(undefined, userDetails);
@@ -21617,6 +22384,10 @@ iD.Entity.prototype = {
         });
     },
 
+    isHighwayIntersection: function() {
+        return false;
+    },
+
     deprecatedTags: function() {
         var tags = _.pairs(this.tags);
         var deprecated = {};
@@ -22265,6 +23036,14 @@ _.extend(iD.Node.prototype, {
         });
     },
 
+    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: {
@@ -22288,6 +23067,37 @@ _.extend(iD.Node.prototype, {
         };
     }
 });
+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
+    },
+    '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);
@@ -22315,14 +23125,15 @@ _.extend(iD.Relation.prototype, {
             if (memo && memo[this.id]) return iD.geo.Extent();
             memo = memo || {};
             memo[this.id] = true;
-            return this.members.reduce(function(extent, member) {
-                member = resolver.hasEntity(member.id);
+
+            var extent = iD.geo.Extent();
+            for (var i = 0; i < this.members.length; i++) {
+                var member = resolver.hasEntity(this.members[i].id);
                 if (member) {
-                    return extent.extend(member.extent(resolver, memo));
-                } else {
-                    return extent;
+                    extent._extend(member.extent(resolver, memo));
                 }
-            }, iD.geo.Extent());
+            }
+            return extent;
         });
     },
 
@@ -22560,21 +23371,19 @@ iD.Tree = function(head) {
     }
 
     function updateParents(entity, insertions, memo) {
-        if (memo && memo[entity.id]) return;
-        memo = memo || {};
-        memo[entity.id] = true;
-
         head.parentWays(entity).forEach(function(parent) {
             if (rectangles[parent.id]) {
                 rtree.remove(rectangles[parent.id]);
-                insertions.push(parent);
+                insertions[parent.id] = parent;
             }
         });
 
         head.parentRelations(entity).forEach(function(parent) {
+            if (memo[entity.id]) return;
+            memo[entity.id] = true;
             if (rectangles[parent.id]) {
                 rtree.remove(rectangles[parent.id]);
-                insertions.push(parent);
+                insertions[parent.id] = parent;
             }
             updateParents(parent, insertions, memo);
         });
@@ -22583,18 +23392,19 @@ iD.Tree = function(head) {
     var tree = {};
 
     tree.rebase = function(entities) {
-        var insertions = [];
+        var insertions = {};
+
+        for (var i = 0; i < entities.length; i++) {
+            var entity = entities[i];
 
-        entities.forEach(function(entity) {
             if (head.entities.hasOwnProperty(entity.id) || rectangles[entity.id])
-                return;
+                continue;
 
-            insertions.push(entity);
-            updateParents(entity, insertions);
-        });
+            insertions[entity.id] = entity;
+            updateParents(entity, insertions, {});
+        }
 
-        insertions = _.unique(insertions).map(entityRectangle);
-        rtree.load(insertions);
+        rtree.load(_.map(insertions, entityRectangle));
 
         return tree;
     };
@@ -22602,7 +23412,7 @@ iD.Tree = function(head) {
     tree.intersects = function(extent, graph) {
         if (graph !== head) {
             var diff = iD.Difference(head, graph),
-                insertions = [];
+                insertions = {};
 
             head = graph;
 
@@ -22613,16 +23423,15 @@ iD.Tree = function(head) {
 
             diff.modified().forEach(function(entity) {
                 rtree.remove(rectangles[entity.id]);
-                insertions.push(entity);
-                updateParents(entity, insertions);
+                insertions[entity.id] = entity;
+                updateParents(entity, insertions, {});
             });
 
             diff.created().forEach(function(entity) {
-                insertions.push(entity);
+                insertions[entity.id] = entity;
             });
 
-            insertions = _.unique(insertions).map(entityRectangle);
-            rtree.load(insertions);
+            rtree.load(_.map(insertions, entityRectangle));
         }
 
         return rtree.search(extentRectangle(extent)).map(function(rect) {
@@ -22648,14 +23457,14 @@ _.extend(iD.Way.prototype, {
 
     extent: function(resolver) {
         return resolver.transient(this, 'extent', function() {
-            return this.nodes.reduce(function(extent, id) {
-                var node = resolver.hasEntity(id);
+            var extent = iD.geo.Extent();
+            for (var i = 0; i < this.nodes.length; i++) {
+                var node = resolver.hasEntity(this.nodes[i]);
                 if (node) {
-                    return extent.extend(node.extent());
-                } else {
-                    return extent;
+                    extent._extend(node.extent());
                 }
-            }, iD.geo.Extent());
+            }
+            return extent;
         });
     },
 
@@ -22676,19 +23485,70 @@ _.extend(iD.Way.prototype, {
         if (this.nodes[this.nodes.length - 1] === node) return 'suffix';
     },
 
+    layer: function() {
+        // explicit layer tag, clamp between -10, 10..
+        if (this.tags.layer !== undefined) {
+            return Math.max(-10, Math.min(+(this.tags.layer), 10));
+        }
+
+        // implied layer tag..
+        if (this.tags.location === 'overground') return 1;
+        if (this.tags.location === 'underground') return -1;
+        if (this.tags.location === 'underwater') return -10;
+
+        if (this.tags.power === 'line') return 10;
+        if (this.tags.power === 'minor_line') return 10;
+        if (this.tags.aerialway) return 10;
+        if (this.tags.bridge) return 1;
+        if (this.tags.cutting) return -1;
+        if (this.tags.tunnel) return -1;
+        if (this.tags.waterway) return -1;
+        if (this.tags.man_made === 'pipeline') return -10;
+        if (this.tags.boundary) return -10;
+        return 0;
+    },
+
     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;
@@ -22801,20 +23661,20 @@ _.extend(iD.Way.prototype, {
         return resolver.transient(this, 'area', function() {
             var nodes = resolver.childNodes(this);
 
-            if (!this.isClosed() && nodes.length) {
-                nodes = nodes.concat([nodes[0]]);
-            }
-
             var json = {
                 type: 'Polygon',
                 coordinates: [_.pluck(nodes, 'loc')]
             };
 
+            if (!this.isClosed() && nodes.length) {
+                json.coordinates[0].push(nodes[0].loc);
+            }
+
             var area = d3.geo.area(json);
 
             // Heuristic for detecting counterclockwise winding order. Assumes
             // that OpenStreetMap polygons are not hemisphere-spanning.
-            if (d3.geo.area(json) > 2 * Math.PI) {
+            if (area > 2 * Math.PI) {
                 json.coordinates[0] = json.coordinates[0].reverse();
                 area = d3.geo.area(json);
             }
@@ -22829,6 +23689,7 @@ iD.Background = function(context) {
             .projection(context.projection),
         gpxLayer = iD.GpxLayer(context, dispatch)
             .projection(context.projection),
+        mapillaryLayer = iD.MapillaryLayer(context),
         overlayLayers = [];
 
     var backgroundSources = iD.data.imagery.map(function(source) {
@@ -22916,6 +23777,14 @@ iD.Background = function(context) {
 
         overlays.exit()
             .remove();
+
+        var mapillary = selection.selectAll('.layer-mapillary')
+            .data([0]);
+
+        mapillary.enter().insert('div')
+            .attr('class', 'layer-layer layer-mapillary');
+
+        mapillary.call(mapillaryLayer);
     }
 
     background.sources = function(extent) {
@@ -22927,6 +23796,7 @@ iD.Background = function(context) {
     background.dimensions = function(_) {
         baseLayer.dimensions(_);
         gpxLayer.dimensions(_);
+        mapillaryLayer.dimensions(_);
 
         overlayLayers.forEach(function(layer) {
             layer.dimensions(_);
@@ -22974,8 +23844,15 @@ iD.Background = function(context) {
 
     background.zoomToGpxLayer = function() {
         if (background.hasGpxLayer()) {
-            context.map()
-                .extent(d3.geo.bounds(gpxLayer.geojson()));
+            var viewport = context.map().extent().polygon(),
+                coords = _.reduce(gpxLayer.geojson().features, function(coords, feature) {
+                    var c = feature.geometry.coordinates;
+                    return _.union(coords, feature.geometry.type === 'Point' ? [c] : c);
+                }, []);
+
+            if (!iD.geo.polygonIntersectsPolygon(viewport, coords)) {
+                context.map().extent(d3.geo.bounds(gpxLayer.geojson()));
+            }
         }
     };
 
@@ -22984,6 +23861,15 @@ iD.Background = function(context) {
         dispatch.change();
     };
 
+    background.showsMapillaryLayer = function() {
+        return mapillaryLayer.enable();
+    };
+
+    background.toggleMapillaryLayer = function() {
+        mapillaryLayer.enable(!mapillaryLayer.enable());
+        dispatch.change();
+    };
+
     background.showsLayer = function(d) {
         return d === baseLayer.source() ||
             (d.id === 'custom' && baseLayer.source().id === 'custom') ||
@@ -23250,7 +24136,7 @@ iD.GpxLayer = function(context) {
                 .append('text')
                 .attr('class', 'gpx')
                 .text(function(d) {
-                    return d.properties.name;
+                    return d.properties.desc || d.properties.name;
                 })
                 .attr('x', function(d) {
                     var centroid = path.centroid(d);
@@ -23344,8 +24230,6 @@ iD.Map = function(context) {
         supersurface = selection.append('div')
             .attr('id', 'supersurface');
 
-        supersurface.call(context.background());
-
         // Need a wrapper div because Opera can't cope with an absolutely positioned
         // SVG element: http://bl.ocks.org/jfirebaugh/6fbfbd922552bf776c16
         var dataLayer = supersurface.append('div')
@@ -23363,6 +24247,8 @@ iD.Map = function(context) {
             .attr('id', 'surface')
             .call(iD.svg.Surface(context));
 
+        supersurface.call(context.background());
+
         surface.on('mousemove.map', function() {
             mousemove = d3.event;
         });
@@ -23387,10 +24273,9 @@ iD.Map = function(context) {
             if (map.editable() && !transformed) {
                 var all = context.intersects(map.extent()),
                     filter = d3.functor(true),
-                    extent = map.extent(),
                     graph = context.graph();
-                surface.call(vertices, graph, all, filter, extent, map.zoom());
-                surface.call(midpoints, graph, all, filter, extent);
+                surface.call(vertices, graph, all, filter, map.extent(), map.zoom());
+                surface.call(midpoints, graph, all, filter, map.trimmedExtent());
                 dispatch.drawn({full: false});
             }
         });
@@ -23409,30 +24294,7 @@ iD.Map = function(context) {
         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));
@@ -23448,7 +24310,7 @@ iD.Map = function(context) {
             .call(vertices, graph, all, filter, map.extent(), map.zoom())
             .call(lines, graph, all, filter)
             .call(areas, graph, all, filter)
-            .call(midpoints, graph, all, filter, map.extent())
+            .call(midpoints, graph, all, filter, map.trimmedExtent())
             .call(labels, graph, all, filter, dimensions, !difference && !extent);
 
         if (points.points(context.intersects(map.extent()), 100).length >= 100) {
@@ -23461,8 +24323,12 @@ iD.Map = function(context) {
     }
 
     function editOff() {
+        var mode = context.mode();
         surface.selectAll('.layer *').remove();
         dispatch.drawn({full: true});
+        if (!(mode && mode.id === 'browse')) {
+            context.enter(iD.modes.Browse(context));
+        }
     }
 
     function zoomPan() {
@@ -23628,8 +24494,8 @@ iD.Map = function(context) {
         return redraw();
     };
 
-    map.zoomIn = function() { return map.zoom(Math.ceil(map.zoom() + 1)); };
-    map.zoomOut = function() { return map.zoom(Math.floor(map.zoom() - 1)); };
+    map.zoomIn = function() { return map.zoom(~~map.zoom() + 1); };
+    map.zoomOut = function() { return map.zoom(~~map.zoom() - 1); };
 
     map.center = function(loc) {
         if (!arguments.length) {
@@ -23700,6 +24566,12 @@ iD.Map = function(context) {
         }
     };
 
+    map.trimmedExtent = function() {
+        var headerY = 60, footerY = 30, pad = 10;
+        return new iD.geo.Extent(projection.invert([pad, dimensions[1] - footerY - pad]),
+                projection.invert([dimensions[0] - pad, headerY + pad]));
+    };
+
     map.extentZoom = function(_) {
         var extent = iD.geo.Extent(_),
             tl = projection([extent[0][0], extent[1][1]]),
@@ -23727,6 +24599,165 @@ iD.Map = function(context) {
 
     return d3.rebind(map, dispatch, 'on');
 };
+iD.MapillaryLayer = function (context) {
+    var enable = false,
+        currentImage,
+        svg, div, request;
+
+    function show(image) {
+        svg.selectAll('g')
+            .classed('selected', function(d) {
+                return currentImage && d.key === currentImage.key;
+            });
+
+        div.classed('hidden', false)
+            .classed('temp', image !== currentImage);
+
+        div.selectAll('img')
+            .attr('src', 'https://d1cuyjsrcm0gby.cloudfront.net/' + image.key + '/thumb-320.jpg');
+
+        div.selectAll('a')
+            .attr('href', 'http://mapillary.com/map/im/' + image.key);
+    }
+
+    function hide() {
+        currentImage = undefined;
+
+        svg.selectAll('g')
+            .classed('selected', false);
+
+        div.classed('hidden', true);
+    }
+
+    function transform(image) {
+        var t = 'translate(' + context.projection(image.loc) + ')';
+        if (image.ca) t += 'rotate(' + image.ca + ',0,0)';
+        return t;
+    }
+
+    function render(selection) {
+        svg = selection.selectAll('svg')
+            .data([0]);
+
+        svg.enter().append('svg')
+            .on('click', function() {
+                var image = d3.event.target.__data__;
+                if (currentImage === image) {
+                    hide();
+                } else {
+                    currentImage = image;
+                    show(image);
+                }
+            })
+            .on('mouseover', function() {
+                show(d3.event.target.__data__);
+            })
+            .on('mouseout', function() {
+                if (currentImage) {
+                    show(currentImage);
+                } else {
+                    hide();
+                }
+            });
+
+        svg.style('display', enable ? 'block' : 'none');
+
+        div = context.container().selectAll('.mapillary-image')
+            .data([0]);
+
+        var enter = div.enter().append('div')
+            .attr('class', 'mapillary-image');
+
+        enter.append('button')
+            .on('click', hide)
+            .append('div')
+            .attr('class', 'icon close');
+
+        enter.append('img');
+
+        var link = enter.append('a')
+            .attr('class', 'link')
+            .attr('target', '_blank');
+
+        link.append('span')
+            .attr('class', 'icon icon-pre-text out-link');
+
+        link.append('span')
+            .text(t('mapillary.view_on_mapillary'));
+
+        if (!enable) {
+            hide();
+
+            svg.selectAll('g')
+                .remove();
+
+            return;
+        }
+
+        // Update existing images while waiting for new ones to load.
+        svg.selectAll('g')
+            .attr('transform', transform);
+
+        var extent = context.map().extent();
+
+        if (request)
+            request.abort();
+
+        request = d3.json('https://mapillary-read-api.herokuapp.com/v1/s/search?min-lat=' +
+            extent[0][1] + '&max-lat=' + extent[1][1] + '&min-lon=' +
+            extent[0][0] + '&max-lon=' + extent[1][0] + '&max-results=100&geojson=true',
+            function (error, data) {
+                if (error) return;
+
+                var images = [];
+
+                for (var i = 0; i < data.features.length; i++) {
+                    var sequence = data.features[i];
+                    for (var j = 0; j < sequence.geometry.coordinates.length; j++) {
+                        images.push({
+                            key: sequence.properties.keys[j],
+                            ca: sequence.properties.cas[j],
+                            loc: sequence.geometry.coordinates[j]
+                        });
+                        if (images.length >= 1000) break;
+                    }
+                }
+
+                var g = svg.selectAll('g')
+                    .data(images, function(d) { return d.key; });
+
+                var enter = g.enter().append('g')
+                    .attr('class', 'image');
+
+                enter.append('path')
+                    .attr('d', 'M 0,-5 l 0,-20 l -5,30 l 10,0 l -5,-30');
+
+                enter.append('circle')
+                    .attr('dx', '0')
+                    .attr('dy', '0')
+                    .attr('r', '8');
+
+                g.attr('transform', transform);
+
+                g.exit()
+                    .remove();
+            });
+    }
+
+    render.enable = function(_) {
+        if (!arguments.length) return enable;
+        enable = _;
+        return render;
+    };
+
+    render.dimensions = function(_) {
+        if (!arguments.length) return svg.dimensions();
+        svg.dimensions(_);
+        return render;
+    };
+
+    return render;
+};
 iD.TileLayer = function() {
     var tileSize = 256,
         tile = d3.geo.tile(),
@@ -23798,6 +24829,7 @@ iD.TileLayer = function() {
             tile().forEach(function(d) {
                 addSource(d);
                 if (d[3] === '') return;
+                if (typeof d[3] !== 'string') return; // Workaround for chrome crash https://github.com/openstreetmap/iD/issues/2295
                 requests.push(d);
                 if (cache[d[3]] === false && lookUp(d)) {
                     requests.push(addSource(lookUp(d)));
@@ -23936,6 +24968,7 @@ iD.svg = {
                 i = 0,
                 offset = dt,
                 segments = [],
+                viewport = iD.geo.Extent(projection.clipExtent()),
                 coordinates = graph.childNodes(entity).map(function(n) {
                     return n.loc;
                 });
@@ -23954,9 +24987,10 @@ iD.svg = {
                     b = [x, y];
 
                     if (a) {
-                        var span = iD.geo.euclideanDistance(a, b) - offset;
+                        var extent = iD.geo.Extent(a).extend(b),
+                            span = iD.geo.euclideanDistance(a, b) - offset;
 
-                        if (span >= 0) {
+                        if (extent.intersects(viewport) && span >= 0) {
                             var angle = Math.atan2(b[1] - a[1], b[0] - a[0]),
                                 dx = dt * Math.cos(angle),
                                 dy = dt * Math.sin(angle),
@@ -24008,6 +25042,7 @@ iD.svg.Areas = function(projection) {
         beach: 'beach',
         scrub: 'scrub',
         construction: 'construction',
+        military: 'construction',
         cemetery: 'cemetery',
         grave_yard: 'cemetery',
         meadow: 'meadow',
@@ -24018,6 +25053,12 @@ iD.svg.Areas = function(projection) {
 
     var patternKeys = ['landuse', 'natural', 'amenity'];
 
+    var clipped = ['residential', 'commercial', 'retail', 'industrial'];
+
+    function clip(entity) {
+        return clipped.indexOf(entity.tags.landuse) !== -1;
+    }
+
     function setPattern(d) {
         for (var i = 0; i < patternKeys.length; i++) {
             if (patterns.hasOwnProperty(d.tags[patternKeys[i]])) {
@@ -24060,13 +25101,39 @@ iD.svg.Areas = function(projection) {
         });
 
         var data = {
+            clip: areas.filter(clip),
             shadow: strokes,
             stroke: strokes,
             fill: areas
         };
 
-        var paths = surface.selectAll('.layer-shadow, .layer-stroke, .layer-fill')
-            .selectAll('path.area')
+        var clipPaths = surface.selectAll('defs').selectAll('.clipPath')
+           .filter(filter)
+           .data(data.clip, iD.Entity.key);
+
+        clipPaths.enter()
+           .append('clipPath')
+           .attr('class', 'clipPath')
+           .attr('id', function(entity) { return entity.id + '-clippath'; })
+           .append('path');
+
+        clipPaths.selectAll('path')
+           .attr('d', path);
+
+        clipPaths.exit()
+           .remove();
+
+        var areagroup = surface
+            .select('.layer-areas')
+            .selectAll('g.areagroup')
+            .data(['fill', 'shadow', 'stroke']);
+
+        areagroup.enter()
+            .append('g')
+            .attr('class', function(d) { return 'layer areagroup area-' + d; });
+
+        var paths = areagroup
+            .selectAll('path')
             .filter(filter)
             .data(function(layer) { return data[layer]; }, iD.Entity.key);
 
@@ -24075,7 +25142,7 @@ iD.svg.Areas = function(projection) {
         paths.exit()
             .remove();
 
-        var fills = surface.selectAll('.layer-fill path.area')[0];
+        var fills = surface.selectAll('.area-fill path.area')[0];
 
         var bisect = d3.bisector(function(node) {
             return -node.__data__.area(graph);
@@ -24094,6 +25161,10 @@ iD.svg.Areas = function(projection) {
 
                 this.setAttribute('class', entity.type + ' area ' + layer + ' ' + entity.id);
 
+                if (layer === 'fill' && clip(entity)) {
+                    this.setAttribute('clip-path', 'url(#' + entity.id + '-clippath)');
+                }
+
                 if (layer === 'fill') {
                     setPattern.apply(this, arguments);
                 }
@@ -24104,6 +25175,135 @@ iD.svg.Areas = function(projection) {
             .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);
 
@@ -24563,80 +25763,98 @@ iD.svg.Lines = function(projection) {
     };
 
     function waystack(a, b) {
-        if (!a || !b || !a.tags || !b.tags) return 0;
-        if (a.tags.layer !== undefined && b.tags.layer !== undefined) {
-            return a.tags.layer - b.tags.layer;
-        }
-        if (a.tags.bridge) return 1;
-        if (b.tags.bridge) return -1;
-        if (a.tags.tunnel) return -1;
-        if (b.tags.tunnel) return 1;
         var as = 0, bs = 0;
-        if (a.tags.highway && b.tags.highway) {
-            as -= highway_stack[a.tags.highway];
-            bs -= highway_stack[b.tags.highway];
-        }
+
+        if (a.tags.highway) { as -= highway_stack[a.tags.highway]; }
+        if (b.tags.highway) { bs -= highway_stack[b.tags.highway]; }
         return as - bs;
     }
 
     return function drawLines(surface, graph, entities, filter) {
-        var lines = [],
-            path = iD.svg.Path(projection, graph);
+        var ways = [], pathdata = {}, onewaydata = {},
+            getPath = iD.svg.Path(projection, graph);
 
         for (var i = 0; i < entities.length; i++) {
             var entity = entities[i],
                 outer = iD.geo.simpleMultipolygonOuterMember(entity, graph);
             if (outer) {
-                lines.push(entity.mergeTags(outer.tags));
+                ways.push(entity.mergeTags(outer.tags));
             } else if (entity.geometry(graph) === 'line') {
-                lines.push(entity);
+                ways.push(entity);
             }
         }
 
-        lines = lines.filter(path);
-        lines.sort(waystack);
+        ways = ways.filter(getPath);
 
-        function drawPaths(klass) {
-            var paths = surface.select('.layer-' + klass)
-                .selectAll('path.line')
-                .filter(filter)
-                .data(lines, iD.Entity.key);
+        pathdata = _.groupBy(ways, function(way) { return way.layer(); });
 
-            var enter = paths.enter()
-                .append('path')
-                .attr('class', function(d) { return 'way line ' + klass + ' ' + d.id; });
+        _.forOwn(pathdata, function(v, k) {
+            onewaydata[k] = _(v)
+                .filter(function(d) { return d.isOneWay(); })
+                .map(iD.svg.OneWaySegments(projection, graph, 35))
+                .flatten()
+                .valueOf();
+        });
 
-            // Optimization: call simple TagClasses only on enter selection. This
-            // works because iD.Entity.key is defined to include the entity v attribute.
-            if (klass !== 'stroke') {
-                enter.call(iD.svg.TagClasses());
-            } else {
-                paths.call(iD.svg.TagClasses()
-                    .tags(iD.svg.MultipolygonMemberTags(graph)));
-            }
+        var layergroup = surface
+            .select('.layer-lines')
+            .selectAll('g.layergroup')
+            .data(d3.range(-10, 11));
 
-            paths
-                .order()
-                .attr('d', path);
+        layergroup.enter()
+            .append('g')
+            .attr('class', function(d) { return 'layer layergroup layer' + String(d); });
 
-            paths.exit()
-                .remove();
-        }
 
-        drawPaths('shadow');
-        drawPaths('casing');
-        drawPaths('stroke');
+        var linegroup = layergroup
+            .selectAll('g.linegroup')
+            .data(['shadow', 'casing', 'stroke']);
 
-        var segments = _(lines)
-            .filter(function(d) { return d.isOneWay(); })
-            .map(iD.svg.OneWaySegments(projection, graph, 35))
-            .flatten()
-            .valueOf();
+        linegroup.enter()
+            .append('g')
+            .attr('class', function(d) { return 'layer linegroup line-' + d; });
 
-        var oneways = surface.select('.layer-oneway')
-            .selectAll('path.oneway')
+
+        var lines = linegroup
+            .selectAll('path')
             .filter(filter)
-            .data(segments, function(d) { return [d.id, d.index]; });
+            .data(
+                function() { return pathdata[this.parentNode.parentNode.__data__] || []; },
+                iD.Entity.key
+            );
+
+        // Optimization: call simple TagClasses only on enter selection. This
+        // works because iD.Entity.key is defined to include the entity v attribute.
+        lines.enter()
+            .append('path')
+            .attr('class', function(d) { return 'way line ' + this.parentNode.__data__ + ' ' + d.id; })
+            .call(iD.svg.TagClasses());
+
+        lines
+            .sort(waystack)
+            .attr('d', getPath)
+            .call(iD.svg.TagClasses().tags(iD.svg.MultipolygonMemberTags(graph)));
+
+        lines.exit()
+            .remove();
+
+
+        var onewaygroup = layergroup
+            .selectAll('g.onewaygroup')
+            .data(['oneway']);
+
+        onewaygroup.enter()
+            .append('g')
+            .attr('class', 'layer onewaygroup');
+
+
+        var oneways = onewaygroup
+            .selectAll('path')
+            .filter(filter)
+            .data(
+                function() { return onewaydata[this.parentNode.parentNode.__data__] || []; },
+                function(d) { return [d.id, d.index]; }
+            );
 
         oneways.enter()
             .append('path')
@@ -24644,72 +25862,113 @@ iD.svg.Lines = function(projection) {
             .attr('marker-mid', 'url(#oneway-marker)');
 
         oneways
-            .order()
             .attr('d', function(d) { return d.d; });
 
         oneways.exit()
             .remove();
+
     };
 };
 iD.svg.Midpoints = function(projection, context) {
     return function drawMidpoints(surface, graph, entities, filter, extent) {
-        var midpoints = {};
+        var poly = extent.polygon(),
+            midpoints = {};
 
         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))) {
-                    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]
-                        };
+                if (midpoints[id]) {
+                    midpoints[id].parents.push(entity);
+                } else {
+                    if (iD.geo.euclideanDistance(projection(a.loc), projection(b.loc)) > 40) {
+                        var point = iD.geo.interp(a.loc, b.loc, 0.5),
+                            loc = null;
+
+                        if (extent.intersects(point)) {
+                            loc = point;
+                        } else {
+                            for (var k = 0; k < 4; k++) {
+                                point = iD.geo.lineIntersection([a.loc, b.loc], [poly[k], poly[k+1]]);
+                                if (point &&
+                                    iD.geo.euclideanDistance(projection(a.loc), projection(point)) > 20 &&
+                                    iD.geo.euclideanDistance(projection(b.loc), projection(point)) > 20)
+                                {
+                                    loc = point;
+                                    break;
+                                }
+                            }
+                        }
+
+                        if (loc) {
+                            midpoints[id] = {
+                                type: 'midpoint',
+                                id: id,
+                                loc: loc,
+                                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()
+        var enter = groups.enter()
             .insert('g', ':first-child')
             .attr('class', 'midpoint');
 
-        group.append('circle')
-            .attr('r', 7)
+        enter.append('polygon')
+            .attr('points', '-6,8 10,0 -6,-8')
             .attr('class', 'shadow');
 
-        group.append('circle')
-            .attr('r', 3)
+        enter.append('polygon')
+            .attr('points', '-3,4 5,0 -3,-4')
             .attr('class', 'fill');
 
-        groups.attr('transform', iD.svg.PointTransform(projection));
+        groups
+            .attr('transform', function(d) {
+                var translate = iD.svg.PointTransform(projection),
+                    a = context.entity(d.edge[0]),
+                    b = context.entity(d.edge[1]),
+                    angle = Math.round(iD.geo.angle(a, b, projection) * (180 / Math.PI));
+                return translate(d) + ' rotate(' + angle + ')';
+            })
+            .call(iD.svg.TagClasses().tags(
+                function(d) { return d.parents[0].tags; }
+            ));
 
         // Propagate data bindings.
-        groups.select('circle.shadow');
-        groups.select('circle.fill');
+        groups.select('polygon.shadow');
+        groups.select('polygon.fill');
 
         groups.exit()
             .remove();
@@ -24784,194 +26043,15 @@ iD.svg.Points = function(projection, context) {
 
     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']])
+iD.svg.Surface = function() {
+    return function (selection) {
+        selection.selectAll('defs')
+            .data([0])
             .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));
+            .append('defs');
 
         var layers = selection.selectAll('.layer')
-            .data(['fill', 'shadow', 'casing', 'stroke', 'oneway', 'hit', 'halo', 'label']);
+            .data(['areas', 'lines', 'hit', 'halo', 'label']);
 
         layers.enter().append('g')
             .attr('class', function(d) { return 'layer layer-' + d; });
@@ -24979,12 +26059,12 @@ iD.svg.Surface = function(context) {
 };
 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; };
@@ -25032,6 +26112,77 @@ iD.svg.TagClasses = function() {
 
     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
@@ -25078,49 +26229,74 @@ iD.svg.Vertices = function(projection, context) {
         return vertices;
     }
 
-    function draw(groups, vertices, klass, graph, zoom) {
-        groups = groups.data(vertices, function(entity) {
-            return iD.Entity.key(entity) + ',' + zoom;
-        });
+    function draw(selection, vertices, klass, graph, zoom) {
+        var icons = {},
+            z;
 
         if (zoom < 17) {
-            zoom = 0;
+            z = 0;
         } else if (zoom < 18) {
-            zoom = 1;
+            z = 1;
         } else {
-            zoom = 2;
+            z = 2;
         }
 
-        var icons = {};
+        var groups = selection.data(vertices, function(entity) {
+            return iD.Entity.key(entity);
+        });
+
         function icon(entity) {
             if (entity.id in icons) return icons[entity.id];
-            icons[entity.id] = zoom !== 0 &&
+            icons[entity.id] =
                 entity.hasInterestingTags() &&
                 context.presets().match(entity, graph).icon;
             return icons[entity.id];
         }
 
-        function circle(klass) {
-            var rads = radiuses[klass];
+        function classCircle(klass) {
             return function(entity) {
-                var i = icon(entity),
-                    c = i ? 0.5 : 0,
-                    r = rads[i ? 3 : zoom];
                 this.setAttribute('class', 'node vertex ' + klass + ' ' + entity.id);
-                this.setAttribute('cx', c);
-                this.setAttribute('cy', -c);
-                this.setAttribute('r', r);
             };
         }
 
-        var enter = groups.enter().append('g')
+        function setAttributes(selection) {
+            ['shadow','stroke','fill'].forEach(function(klass) {
+                var rads = radiuses[klass];
+                selection.selectAll('.' + klass)
+                    .each(function(entity) {
+                        var i = z && icon(entity),
+                            c = i ? 0.5 : 0,
+                            r = rads[i ? 3 : z];
+                        this.setAttribute('cx', c);
+                        this.setAttribute('cy', -c);
+                        this.setAttribute('r', r);
+                        if (i && klass === 'fill') {
+                            this.setAttribute('visibility', 'hidden');
+                        } else {
+                            this.removeAttribute('visibility');
+                        }
+                    });
+            });
+
+            selection.selectAll('use')
+                .each(function() {
+                    if (z) {
+                        this.removeAttribute('visibility');
+                    } else {
+                        this.setAttribute('visibility', 'hidden');
+                    }
+                });
+        }
+
+        var enter = groups.enter()
+            .append('g')
             .attr('class', function(d) { return 'node vertex ' + klass + ' ' + d.id; });
 
         enter.append('circle')
-            .each(circle('shadow'));
+            .each(classCircle('shadow'));
 
         enter.append('circle')
-            .each(circle('stroke'));
+            .each(classCircle('stroke'));
 
         // Vertices with icons get a `use`.
         enter.filter(function(d) { return icon(d); })
@@ -25129,14 +26305,15 @@ iD.svg.Vertices = function(projection, context) {
             .attr('clip-path', 'url(#clip-square-12)')
             .attr('xlink:href', function(d) { return '#maki-' + icon(d) + '-12'; });
 
-        // Vertices with tags get a `circle`.
-        enter.filter(function(d) { return !icon(d) && d.hasInterestingTags(); })
+        // Vertices with tags get a fill.
+        enter.filter(function(d) { return d.hasInterestingTags(); })
             .append('circle')
-            .each(circle('fill'));
+            .each(classCircle('fill'));
 
         groups
             .attr('transform', iD.svg.PointTransform(projection))
-            .classed('shared', function(entity) { return graph.isShared(entity); });
+            .classed('shared', function(entity) { return graph.isShared(entity); })
+            .call(setAttributes);
 
         groups.exit()
             .remove();
@@ -25196,6 +26373,10 @@ iD.ui = function(context) {
             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')
@@ -25260,23 +26441,24 @@ iD.ui = function(context) {
             .attr('class', 'map-control help-control')
             .call(iD.ui.Help(context));
 
-        var about = content.append('div')
-            .attr('class','col12 about-block fillD');
+        var footer = content.append('div')
+            .attr('id', 'footer')
+            .attr('class', 'fillD');
 
-        about.append('div')
-            .attr('class', 'api-status')
-            .call(iD.ui.Status(context));
+        footer.append('div')
+            .attr('id', 'scale-block')
+            .call(iD.ui.Scale(context));
+
+        var linkList = footer.append('div')
+            .attr('id', 'info-block')
+            .append('ul')
+            .attr('id', 'about-list')
+            .attr('class', 'link-list');
 
         if (!context.embed()) {
-            about.append('div')
-                .attr('class', 'account')
-                .call(iD.ui.Account(context));
+            linkList.call(iD.ui.Account(context));
         }
 
-        var linkList = about.append('ul')
-            .attr('id', 'about')
-            .attr('class', 'link-list');
-
         linkList.append('li')
             .append('a')
             .attr('target', '_blank')
@@ -25303,6 +26485,10 @@ iD.ui = function(context) {
             .attr('tabindex', -1)
             .call(iD.ui.Contributors(context));
 
+        footer.append('div')
+            .attr('class', 'api-status')
+            .call(iD.ui.Status(context));
+
         window.onbeforeunload = function() {
             return context.save();
         };
@@ -25373,20 +26559,25 @@ iD.ui.Account = function(context) {
 
     function update(selection) {
         if (!connection.authenticated()) {
-            selection.html('')
+            selection.selectAll('#userLink, #logoutLink')
                 .style('display', 'none');
             return;
         }
 
-        selection.style('display', 'block');
-
         connection.userDetails(function(err, details) {
-            selection.html('');
+            var userLink = selection.select('#userLink'),
+                logoutLink = selection.select('#logoutLink');
+
+            userLink.html('');
+            logoutLink.html('');
 
             if (err) return;
 
+            selection.selectAll('#userLink, #logoutLink')
+                .style('display', 'list-item');
+
             // Link
-            var userLink = selection.append('a')
+            userLink.append('a')
                 .attr('href', connection.userURL(details.display_name))
                 .attr('target', '_blank');
 
@@ -25405,7 +26596,7 @@ iD.ui.Account = function(context) {
                 .attr('class', 'label')
                 .text(details.display_name);
 
-            selection.append('a')
+            logoutLink.append('a')
                 .attr('class', 'logout')
                 .attr('href', '#')
                 .text(t('logout'))
@@ -25417,7 +26608,15 @@ iD.ui.Account = function(context) {
     }
 
     return function(selection) {
-        connection.on('auth', function() { update(selection); });
+        selection.append('li')
+            .attr('id', 'logoutLink')
+            .style('display', 'none');
+
+        selection.append('li')
+            .attr('id', 'userLink')
+            .style('display', 'none');
+
+        connection.on('auth.account', function() { update(selection); });
         update(selection);
     };
 };
@@ -25511,7 +26710,7 @@ iD.ui.Background = function(context) {
             ['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;
@@ -25580,6 +26779,11 @@ iD.ui.Background = function(context) {
             update();
         }
 
+        function clickMapillary() {
+            context.background().toggleMapillaryLayer();
+            update();
+        }
+
         function drawList(layerList, type, change, filter) {
             var sources = context.background()
                 .sources(context.map().extent())
@@ -25627,6 +26831,13 @@ iD.ui.Background = function(context) {
                 .property('disabled', !hasGpx)
                 .property('checked', showsGpx);
 
+            var showsMapillary = context.background().showsMapillaryLayer();
+
+            mapillaryLayerItem
+                .classed('active', showsMapillary)
+                .selectAll('input')
+                .property('checked', showsMapillary);
+
             selectLayer();
 
             var source = context.background().baseLayerSource();
@@ -25767,6 +26978,20 @@ iD.ui.Background = function(context) {
         var overlayList = content.append('ul')
             .attr('class', 'layer-list');
 
+        var mapillaryLayerItem = overlayList.append('li');
+
+        label = mapillaryLayerItem.append('label')
+            .call(bootstrap.tooltip()
+                .title(t('mapillary.tooltip'))
+                .placement('top'));
+
+        label.append('input')
+            .attr('type', 'checkbox')
+            .on('change', clickMapillary);
+
+        label.append('span')
+            .text(t('mapillary.title'));
+
         var gpxLayerItem = content.append('ul')
             .style('display', iD.detect().filedrop ? 'block' : 'none')
             .attr('class', 'layer-list')
@@ -25861,6 +27086,9 @@ iD.ui.Background = function(context) {
 
         var keybinding = d3.keybinding('background');
         keybinding.on(key, toggle);
+        keybinding.on('m', function() {
+            context.enter(iD.modes.SelectImage(context));
+        });
 
         d3.select(document)
             .call(keybinding);
@@ -25942,6 +27170,7 @@ iD.ui.Commit = function(context) {
 
         var commentField = commentSection.append('textarea')
             .attr('placeholder', t('commit.description_placeholder'))
+            .attr('maxlength', 255)
             .property('value', context.storage('comment') || '')
             .on('blur.save', function () {
                 context.storage('comment', this.value);
@@ -26034,7 +27263,7 @@ iD.ui.Commit = function(context) {
             .attr('class', 'commit-section modal-section fillL2');
 
         changeSection.append('h3')
-            .text(summary.length + ' Changes');
+            .text(t('commit.changes', {count: summary.length}));
 
         var li = changeSection.append('ul')
             .attr('class', 'changeset-list')
@@ -26054,7 +27283,7 @@ iD.ui.Commit = function(context) {
         li.append('span')
             .attr('class', 'change-type')
             .text(function(d) {
-                return d.changeType + ' ';
+                return t('commit.' + d.changeType) + ' ';
             });
 
         li.append('strong')
@@ -26258,6 +27487,8 @@ iD.ui.EntityEditor = function(context) {
         preset,
         reference;
 
+    var presetEditor = iD.ui.preset(context)
+        .on('change', changeTags);
     var rawTagEditor = iD.ui.RawTagEditor(context)
         .on('change', changeTags);
 
@@ -26344,12 +27575,11 @@ iD.ui.EntityEditor = function(context) {
             .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
@@ -26386,11 +27616,13 @@ iD.ui.EntityEditor = function(context) {
 
     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;
     }
 
@@ -26499,15 +27731,16 @@ iD.ui.FeatureList = function(context) {
                 });
             }
 
-            var locationMatch = q.match(/^(-?\d+\.?\d*)\s+(-?\d+\.?\d*)$/);
+            var locationMatch = sexagesimal.pair(q.toUpperCase()) || q.match(/^(-?\d+\.?\d*)\s+(-?\d+\.?\d*)$/);
 
             if (locationMatch) {
+                var loc = [parseFloat(locationMatch[0]), parseFloat(locationMatch[1])];
                 result.push({
                     id: -1,
                     geometry: 'point',
                     type: t('inspector.location'),
-                    name: locationMatch[0],
-                    location: [parseFloat(locationMatch[1]), parseFloat(locationMatch[2])]
+                    name: loc[0].toFixed(6) + ', ' + loc[1].toFixed(6),
+                    location: loc
                 });
             }
 
@@ -26908,7 +28141,12 @@ iD.ui.Inspector = function(context) {
         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);
@@ -27436,6 +28674,10 @@ iD.ui.preset = function(context) {
                 }
             });
 
+            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));
@@ -27498,7 +28740,7 @@ iD.ui.preset = function(context) {
                 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);
@@ -27560,6 +28802,7 @@ iD.ui.preset = function(context) {
 
     presets.preset = function(_) {
         if (!arguments.length) return preset;
+        if (preset && preset.id === _.id) return presets;
         preset = _;
         fields = null;
         return presets;
@@ -27580,6 +28823,7 @@ iD.ui.preset = function(context) {
 
     presets.entityID = function(_) {
         if (!arguments.length) return id;
+        if (id === _) return presets;
         id = _;
         fields = null;
         return presets;
@@ -27605,7 +28849,7 @@ iD.ui.PresetIcon = function() {
         $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];
             }
@@ -28037,6 +29281,10 @@ iD.ui.RawMemberEditor = function(context) {
         context.perform(
             iD.actions.DeleteMember(d.relation.id, d.index),
             t('operations.delete_member.annotation'));
+
+        if (!context.hasEntity(d.relation.id)) {
+            context.enter(iD.modes.Browse(context));
+        }
     }
 
     function rawMemberEditor(selection) {
@@ -28353,12 +29601,12 @@ iD.ui.RawTagEditor = function(context) {
 
         selection.call(iD.ui.Disclosure()
             .title(t('inspector.all_tags') + ' (' + count + ')')
-            .expanded(iD.ui.RawTagEditor.expanded || preset.isFallback())
+            .expanded(context.storage('raw_tag_editor.expanded') === 'true' || preset.isFallback())
             .on('toggled', toggled)
             .content(content));
 
         function toggled(expanded) {
-            iD.ui.RawTagEditor.expanded = expanded;
+            context.storage('raw_tag_editor.expanded', expanded);
             if (expanded) {
                 selection.node().parentNode.scrollTop += 200;
             }
@@ -28503,10 +29751,22 @@ iD.ui.RawTagEditor = function(context) {
         }
 
         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);
         }
 
@@ -28642,7 +29902,7 @@ iD.ui.Save = function(context) {
             .text('0');
 
         var keybinding = d3.keybinding('undo-redo')
-            .on(key, save);
+            .on(key, save, true);
 
         d3.select(document)
             .call(keybinding);
@@ -28672,6 +29932,88 @@ iD.ui.Save = function(context) {
         });
     };
 };
+iD.ui.Scale = function(context) {
+    var projection = context.projection,
+        imperial = (iD.detect().locale.toLowerCase() === 'en-us'),
+        maxLength = 180,
+        tickHeight = 8;
+
+    function scaleDefs(loc1, loc2) {
+        var lat = (loc2[1] + loc1[1]) / 2,
+            conversion = (imperial ? 3.28084 : 1),
+            dist = iD.geo.lonToMeters(loc2[0] - loc1[0], lat) * conversion,
+            scale = { dist: 0, px: 0, text: '' },
+            buckets, i, val, dLon;
+
+        if (imperial) {
+            buckets = [5280000, 528000, 52800, 5280, 500, 50, 5, 1];
+        } else {
+            buckets = [5000000, 500000, 50000, 5000, 500, 50, 5, 1];
+        }
+
+        // determine a user-friendly endpoint for the scale
+        for (i = 0; i < buckets.length; i++) {
+            val = buckets[i];
+            if (dist >= val) {
+                scale.dist = Math.floor(dist / val) * val;
+                break;
+            }
+        }
+
+        dLon = iD.geo.metersToLon(scale.dist / conversion, lat);
+        scale.px = Math.round(projection([loc1[0] + dLon, loc1[1]])[0]);
+
+        if (imperial) {
+            if (scale.dist >= 5280) {
+                scale.dist /= 5280;
+                scale.text = String(scale.dist) + ' mi';
+            } else {
+                scale.text = String(scale.dist) + ' ft';
+            }
+        } else {
+            if (scale.dist >= 1000) {
+                scale.dist /= 1000;
+                scale.text = String(scale.dist) + ' km';
+            } else {
+                scale.text = String(scale.dist) + ' m';
+            }
+        }
+
+        return scale;
+    }
+
+    function update(selection) {
+        // choose loc1, loc2 along bottom of viewport (near where the scale will be drawn)
+        var dims = context.map().dimensions(),
+            loc1 = projection.invert([0, dims[1]]),
+            loc2 = projection.invert([maxLength, dims[1]]),
+            scale = scaleDefs(loc1, loc2);
+
+        selection.select('#scalepath')
+            .attr('d', 'M0.5,0.5v' + tickHeight + 'h' + scale.px + 'v-' + tickHeight);
+
+        selection.select('#scaletext')
+            .attr('x', scale.px + 8)
+            .attr('y', tickHeight)
+            .text(scale.text);
+    }
+
+    return function(selection) {
+        var g = selection.append('svg')
+            .attr('id', 'scale')
+            .append('g')
+            .attr('transform', 'translate(10,11)');
+
+        g.append('path').attr('id', 'scalepath');
+        g.append('text').attr('id', 'scaletext');
+
+        update(selection);
+
+        context.map().on('move.scale', function() {
+            update(selection);
+        });
+    };
+};
 iD.ui.SelectionList = function(context, selectedIDs) {
 
     function selectionList(selection) {
@@ -28809,6 +30151,7 @@ iD.ui.Sidebar = function(context) {
 
         sidebar.hide = function() {
             featureListWrap.classed('inspector-hidden', false);
+            inspectorWrap.classed('inspector-hidden', true);
             if (current) current.remove();
             current = null;
         };
@@ -29308,11 +30651,16 @@ iD.ui.Zoom = function(context) {
         button.append('span')
             .attr('class', function(d) { return d.id + ' icon'; });
 
-        var keybinding = d3.keybinding('zoom')
-            .on('+', function() { context.zoomIn(); })
-            .on('-', function() { context.zoomOut(); })
-            .on('⇧=', function() { context.zoomIn(); })
-            .on('dash', function() { context.zoomOut(); });
+        var keybinding = d3.keybinding('zoom');
+
+        _.each(['=','ffequals','plus','ffplus'], function(key) {
+            keybinding.on(key, function() { context.zoomIn(); });
+            keybinding.on('⇧' + key, function() { context.zoomIn(); });
+        });
+        _.each(['-','ffminus','_','dash'], function(key) {
+            keybinding.on(key, function() { context.zoomOut(); });
+            keybinding.on('⇧' + key, function() { context.zoomOut(); });
+        });
 
         d3.select(document)
             .call(keybinding);
@@ -29369,10 +30717,11 @@ iD.ui.preset.access = function(field) {
     }
 
     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) {
@@ -29385,65 +30734,104 @@ iD.ui.preset.access = function(field) {
 
     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'
         }
     };
 
@@ -29459,7 +30847,9 @@ iD.ui.preset.access = function(field) {
 
         _.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;
+                });
         });
     };
 
@@ -29471,12 +30861,18 @@ iD.ui.preset.access = function(field) {
     return d3.rebind(access, event, 'on');
 };
 iD.ui.preset.address = function(field, context) {
-    var event = d3.dispatch('change'),
-        housenumber,
-        street,
-        city,
-        postcode,
-        entity;
+    var event = d3.dispatch('init', 'change'),
+        wrap,
+        entity,
+        isInitialized;
+
+    var widths = {
+        housenumber: 1/3,
+        street: 2/3,
+        city: 2/3,
+        state: 1/4,
+        postcode: 1/3
+    };
 
     function getStreets() {
         var extent = entity.extent(context.graph()),
@@ -29561,71 +30957,95 @@ iD.ui.preset.address = function(field, context) {
     }
 
     function address(selection) {
-        var wrap = selection.selectAll('.preset-input-wrap')
-            .data([0]);
+        selection.selectAll('.preset-input-wrap')
+            .remove();
+
+        var center = entity.extent(context.graph()).center(),
+            addressFormat;
 
         // Enter
 
-        var enter = wrap.enter().append('div')
+        wrap = selection.append('div')
             .attr('class', 'preset-input-wrap');
 
-        enter.append('input')
-            .property('type', 'text')
-            .attr('placeholder', field.t('placeholders.number'))
-            .attr('class', 'addr-number');
+        iD.countryCode().search(center, function (err, countryCode) {
+            addressFormat = _.find(iD.data.addressFormats, function (a) {
+                return a && a.countryCodes && _.contains(a.countryCodes, countryCode);
+            }) || _.first(iD.data.addressFormats);
 
-        enter.append('input')
-            .property('type', 'text')
-            .attr('placeholder', field.t('placeholders.street'))
-            .attr('class', 'addr-street');
+            function row(r) {
+                // Normalize widths.
+                var total = _.reduce(r, function(sum, field) {
+                    return sum + (widths[field] || 0.5);
+                }, 0);
 
-        enter.append('input')
-            .property('type', 'text')
-            .attr('placeholder', field.t('placeholders.city'))
-            .attr('class', 'addr-city');
+                return r.map(function (field) {
+                    return {
+                        id: field,
+                        width: (widths[field] || 0.5) / total
+                    };
+                });
+            }
 
-        enter.append('input')
-            .property('type', 'text')
-            .attr('placeholder', field.t('placeholders.postcode'))
-            .attr('class', 'addr-postcode');
+            wrap.selectAll('div')
+                .data(addressFormat.format)
+                .enter()
+                .append('div')
+                .attr('class', 'addr-row')
+                .selectAll('input')
+                .data(row)
+                .enter()
+                .append('input')
+                .property('type', 'text')
+                .attr('placeholder', function (d) { return field.t('placeholders.' + d.id); })
+                .attr('class', function (d) { return 'addr-' + d.id; })
+                .style('width', function (d) { return d.width * 100 + '%'; });
 
-        // Update
+            // Update
 
-        housenumber = wrap.select('.addr-number');
-        street = wrap.select('.addr-street');
-        city = wrap.select('.addr-city');
-        postcode = wrap.select('.addr-postcode');
+            wrap.selectAll('.addr-street')
+                .call(d3.combobox()
+                    .fetcher(function(value, callback) {
+                        callback(getStreets());
+                    }));
 
-        wrap.selectAll('input')
-            .on('blur', change)
-            .on('change', change);
+            wrap.selectAll('.addr-city')
+                .call(d3.combobox()
+                    .fetcher(function(value, callback) {
+                        callback(getCities());
+                    }));
 
-        street
-            .call(d3.combobox()
-                .fetcher(function(value, callback) {
-                    callback(getStreets());
-                }));
+            wrap.selectAll('.addr-postcode')
+                .call(d3.combobox()
+                    .fetcher(function(value, callback) {
+                        callback(getPostCodes());
+                    }));
 
-        city
-            .call(d3.combobox()
-                .fetcher(function(value, callback) {
-                    callback(getCities());
-                }));
+            wrap.selectAll('input')
+                .on('blur', change)
+                .on('change', change);
 
-        postcode
-            .call(d3.combobox()
-                .fetcher(function(value, callback) {
-                    callback(getPostCodes());
-                }));
+            event.init();
+            isInitialized = true;
+        });
     }
 
     function change() {
-        event.change({
-            'addr:housenumber': housenumber.value() || undefined,
-            'addr:street': street.value() || undefined,
-            'addr:city': city.value() || undefined,
-            'addr:postcode': postcode.value() || undefined
-        });
+        var tags = {};
+
+        wrap.selectAll('input')
+            .each(function (field) {
+                tags['addr:' + field.id] = this.value || undefined;
+            });
+
+        event.change(tags);
+    }
+
+    function updateTags(tags) {
+        wrap.selectAll('input')
+            .value(function (field) {
+                return tags['addr:' + field.id] || '';
+            });
     }
 
     address.entity = function(_) {
@@ -29635,27 +31055,55 @@ iD.ui.preset.address = function(field, context) {
     };
 
     address.tags = function(tags) {
-        housenumber.value(tags['addr:housenumber'] || '');
-        street.value(tags['addr:street'] || '');
-        city.value(tags['addr:city'] || '');
-        postcode.value(tags['addr:postcode'] || '');
+        if (isInitialized) {
+            updateTags(tags);
+        } else {
+            event.on('init', function () {
+                updateTags(tags);
+            });
+        }
     };
 
     address.focus = function() {
-        housenumber.node().focus();
+        wrap.selectAll('input').node().focus();
     };
 
     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('options.' + 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[0] = t('presets.fields.oneway_yes.options.undefined');
+                    break;
+                }
+            }
+        }
+
         selection.classed('checkselect', 'true');
 
         label = selection.selectAll('.preset-input-wrap')
@@ -29665,18 +31113,18 @@ iD.ui.preset.check = function(field) {
             .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();
             });
@@ -29684,11 +31132,17 @@ iD.ui.preset.check = function(field) {
         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);
     };
 
@@ -29701,6 +31155,9 @@ iD.ui.preset.check = function(field) {
 iD.ui.preset.combo =
 iD.ui.preset.typeCombo = function(field) {
     var event = d3.dispatch('change'),
+        optstrings = field.strings && field.strings.options,
+        optarray = field.options,
+        strings = {},
         input;
 
     function combo(selection) {
@@ -29709,42 +31166,67 @@ iD.ui.preset.typeCombo = function(field) {
         input = selection.selectAll('input')
             .data([0]);
 
-        input.enter().append('input')
+        var enter = input.enter()
+            .append('input')
             .attr('type', 'text')
             .attr('id', 'preset-input-' + field.id);
 
+        if (optstrings) { enter.attr('readonly', 'readonly'); }
+
         input
+            .call(combobox)
             .on('change', change)
             .on('blur', change)
             .each(function() {
-                if (field.options) {
-                    options(field.options);
+                if (optstrings) {
+                    _.each(optstrings, function(v, k) {
+                        strings[k] = field.t('options.' + k, { 'default': v });
+                    });
+                    stringsLoaded();
+                } else if (optarray) {
+                    _.each(optarray, function(k) {
+                        strings[k] = k.replace(/_+/g, ' ');
+                    });
+                    stringsLoaded();
                 } else {
-                    iD.taginfo().values({
-                        key: field.key
-                    }, function(err, data) {
-                        if (!err) options(_.pluck(data, 'value'));
+                    iD.taginfo().values({key: field.key}, function(err, data) {
+                        if (!err) {
+                            _.each(_.pluck(data, 'value'), function(k) {
+                                strings[k] = k.replace(/_+/g, ' ');
+                            });
+                            stringsLoaded();
+                        }
                     });
                 }
-            })
-            .call(combobox);
+            });
 
-        function options(opts) {
-            combobox.data(opts.map(function(d) {
-                var o = {};
-                o.title = o.value = d.replace('_', ' ');
+        function stringsLoaded() {
+            var keys = _.keys(strings),
+                strs = [],
+                placeholders;
+
+            combobox.data(keys.map(function(k) {
+                var s = strings[k],
+                    o = {};
+                o.title = o.value = s;
+                if (s.length < 20) { strs.push(s); }
                 return o;
             }));
 
-            input.attr('placeholder', function() {
-                if (opts.length < 3) return '';
-                return opts.slice(0, 3).join(', ') + '...';
-            });
+            placeholders = strs.length > 1 ? strs : keys;
+            input.attr('placeholder', field.placeholder() ||
+                (placeholders.slice(0, 3).join(', ') + '...'));
         }
     }
 
     function change() {
-        var value = input.value().replace(' ', '_');
+        var optstring = _.find(_.keys(strings), function(k) { return strings[k] === input.value(); }),
+            value = optstring || (input.value()
+                .split(';')
+                .map(function(s) { return s.trim(); })
+                .join(';')
+                .replace(/\s+/g, '_'));
+
         if (field.type === 'typeCombo' && !value) value = 'yes';
 
         var t = {};
@@ -29753,8 +31235,9 @@ iD.ui.preset.typeCombo = function(field) {
     }
 
     combo.tags = function(tags) {
-        var value = tags[field.key] || '';
-        if (field.type === 'typeCombo' && value === 'yes') value = '';
+        var key = tags[field.key],
+            value = strings[key] || key || '';
+        if (field.type === 'typeCombo' && value.toLowerCase() === 'yes') value = '';
         input.value(value);
     };
 
@@ -29764,36 +31247,6 @@ iD.ui.preset.typeCombo = function(field) {
 
     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 =
@@ -29876,10 +31329,6 @@ iD.ui.preset.localized = function(field, context) {
             .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(
@@ -29887,6 +31336,10 @@ iD.ui.preset.localized = function(field, context) {
             ));
         }
 
+        input
+            .on('blur', change)
+            .on('change', change);
+
         var translateButton = selection.selectAll('.localized-add')
             .data([0]);
 
@@ -30116,9 +31569,9 @@ iD.ui.preset.maxspeed = function(field, context) {
             .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;
@@ -30278,6 +31731,146 @@ iD.ui.preset.radio = function(field) {
 
     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,
+                            datum.from,
+                            datum.via,
+                            datum.to,
+                            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'),
@@ -30356,9 +31949,9 @@ iD.ui.preset.wikipedia = function(field, context) {
             .value('English');
 
         lang
+            .call(langcombo)
             .on('blur', changeLang)
-            .on('change', changeLang)
-            .call(langcombo);
+            .on('change', changeLang);
 
         title = selection.selectAll('input.wiki-title')
             .data([0]);
@@ -30369,9 +31962,9 @@ iD.ui.preset.wikipedia = function(field, context) {
             .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]);
@@ -31222,7 +32815,7 @@ iD.presets.Field = function(id, field) {
     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) {
@@ -31384,7 +32977,7 @@ iD.validate = function(changes, graph) {
         if ((geometry === 'point' || geometry === 'line' || geometry === 'area') && !change.isUsed(graph)) {
             warnings.push({
                 message: t('validations.untagged_' + geometry),
-                tooltip: t('validations.untagged_tooltip', {geometry: geometry}),
+                tooltip: t('validations.untagged_' + geometry + '_tooltip'),
                 entity: change
             });
         }
@@ -35745,6 +37338,404 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "terms_text": "geoimage.at",
             "id": "geoimage.at"
         },
+        {
+            "name": "Geoportal.gov.pl (Orthophotomap)",
+            "type": "tms",
+            "template": "http://wms.misek.pl/geoportal.orto/tms/{zoom}/{x}/{y}",
+            "scaleExtent": [
+                6,
+                24
+            ],
+            "polygon": [
+                [
+                    [
+                        15.9751041,
+                        54.3709213
+                    ],
+                    [
+                        16.311164,
+                        54.5561775
+                    ],
+                    [
+                        17.1391878,
+                        54.7845723
+                    ],
+                    [
+                        18.3448458,
+                        54.9022727
+                    ],
+                    [
+                        19.6613689,
+                        54.4737213
+                    ],
+                    [
+                        20.2815206,
+                        54.4213456
+                    ],
+                    [
+                        21.4663914,
+                        54.3406369
+                    ],
+                    [
+                        22.7759855,
+                        54.3769755
+                    ],
+                    [
+                        22.8625989,
+                        54.4233613
+                    ],
+                    [
+                        23.2956657,
+                        54.2678633
+                    ],
+                    [
+                        23.5347186,
+                        54.0955258
+                    ],
+                    [
+                        23.5208604,
+                        53.9775182
+                    ],
+                    [
+                        23.7183389,
+                        53.4629603
+                    ],
+                    [
+                        23.9296755,
+                        53.1856735
+                    ],
+                    [
+                        23.9296755,
+                        52.6887269
+                    ],
+                    [
+                        23.732197,
+                        52.6067497
+                    ],
+                    [
+                        23.5658994,
+                        52.5878101
+                    ],
+                    [
+                        23.2090523,
+                        52.3302642
+                    ],
+                    [
+                        23.1951942,
+                        52.2370089
+                    ],
+                    [
+                        23.5035377,
+                        52.1860596
+                    ],
+                    [
+                        23.6906226,
+                        52.0030113
+                    ],
+                    [
+                        23.5970802,
+                        51.739903
+                    ],
+                    [
+                        23.6629063,
+                        51.3888562
+                    ],
+                    [
+                        23.9366046,
+                        50.9827781
+                    ],
+                    [
+                        24.1687284,
+                        50.8604752
+                    ],
+                    [
+                        24.0197534,
+                        50.8035823
+                    ],
+                    [
+                        24.1098313,
+                        50.6610467
+                    ],
+                    [
+                        24.0578633,
+                        50.4188439
+                    ],
+                    [
+                        23.6178674,
+                        50.3083403
+                    ],
+                    [
+                        22.6824431,
+                        49.5163532
+                    ],
+                    [
+                        22.7378756,
+                        49.2094935
+                    ],
+                    [
+                        22.9041733,
+                        49.0780441
+                    ],
+                    [
+                        22.8625989,
+                        48.9940062
+                    ],
+                    [
+                        22.6096878,
+                        49.0371785
+                    ],
+                    [
+                        22.0761495,
+                        49.2004392
+                    ],
+                    [
+                        21.8474902,
+                        49.3721872
+                    ],
+                    [
+                        21.3763135,
+                        49.4488281
+                    ],
+                    [
+                        21.1026153,
+                        49.3721872
+                    ],
+                    [
+                        20.9120659,
+                        49.3022043
+                    ],
+                    [
+                        20.6452967,
+                        49.3902311
+                    ],
+                    [
+                        20.1845136,
+                        49.3315641
+                    ],
+                    [
+                        20.1186875,
+                        49.2004392
+                    ],
+                    [
+                        19.9419962,
+                        49.1302123
+                    ],
+                    [
+                        19.765305,
+                        49.2117568
+                    ],
+                    [
+                        19.7479823,
+                        49.3992506
+                    ],
+                    [
+                        19.6024718,
+                        49.4150307
+                    ],
+                    [
+                        19.5089294,
+                        49.5815389
+                    ],
+                    [
+                        19.4292451,
+                        49.5905232
+                    ],
+                    [
+                        19.2317666,
+                        49.4150307
+                    ],
+                    [
+                        18.9961783,
+                        49.387976
+                    ],
+                    [
+                        18.9338167,
+                        49.4916048
+                    ],
+                    [
+                        18.8368097,
+                        49.4938552
+                    ],
+                    [
+                        18.8021643,
+                        49.6623381
+                    ],
+                    [
+                        18.6427958,
+                        49.7094091
+                    ],
+                    [
+                        18.521537,
+                        49.8994693
+                    ],
+                    [
+                        18.0815412,
+                        50.0109209
+                    ],
+                    [
+                        17.8875272,
+                        49.9886512
+                    ],
+                    [
+                        17.7385522,
+                        50.0687739
+                    ],
+                    [
+                        17.6068999,
+                        50.1709584
+                    ],
+                    [
+                        17.7454813,
+                        50.2153184
+                    ],
+                    [
+                        17.710836,
+                        50.3017019
+                    ],
+                    [
+                        17.4163505,
+                        50.2640668
+                    ],
+                    [
+                        16.9486384,
+                        50.4453265
+                    ],
+                    [
+                        16.8932058,
+                        50.4033889
+                    ],
+                    [
+                        17.0006064,
+                        50.3105529
+                    ],
+                    [
+                        17.017929,
+                        50.2241854
+                    ],
+                    [
+                        16.8135215,
+                        50.186489
+                    ],
+                    [
+                        16.6402948,
+                        50.0976742
+                    ],
+                    [
+                        16.4324227,
+                        50.2862087
+                    ],
+                    [
+                        16.1968344,
+                        50.4276731
+                    ],
+                    [
+                        16.4220291,
+                        50.5885165
+                    ],
+                    [
+                        16.3388803,
+                        50.6632429
+                    ],
+                    [
+                        16.2280152,
+                        50.6368824
+                    ],
+                    [
+                        16.0547884,
+                        50.6127057
+                    ],
+                    [
+                        15.5732181,
+                        50.7641544
+                    ],
+                    [
+                        15.2683391,
+                        50.8976368
+                    ],
+                    [
+                        15.2440873,
+                        50.980597
+                    ],
+                    [
+                        15.0292862,
+                        51.0133036
+                    ],
+                    [
+                        15.0015699,
+                        50.8582883
+                    ],
+                    [
+                        14.8110205,
+                        50.8735944
+                    ],
+                    [
+                        14.956531,
+                        51.0721176
+                    ],
+                    [
+                        15.0188926,
+                        51.2914636
+                    ],
+                    [
+                        14.9392083,
+                        51.4601459
+                    ],
+                    [
+                        14.7209426,
+                        51.5571799
+                    ],
+                    [
+                        14.7521234,
+                        51.6260562
+                    ],
+                    [
+                        14.5996839,
+                        51.8427626
+                    ],
+                    [
+                        14.70362,
+                        52.0733396
+                    ],
+                    [
+                        14.5581095,
+                        52.2497371
+                    ],
+                    [
+                        14.5165351,
+                        52.425436
+                    ],
+                    [
+                        14.6031485,
+                        52.5878101
+                    ],
+                    [
+                        14.1146491,
+                        52.8208272
+                    ],
+                    [
+                        14.152759,
+                        52.9733951
+                    ],
+                    [
+                        14.3502374,
+                        53.0734212
+                    ],
+                    [
+                        14.4229927,
+                        53.2665624
+                    ],
+                    [
+                        14.1977979,
+                        53.8734759
+                    ],
+                    [
+                        14.2220497,
+                        53.9958517
+                    ]
+                ]
+            ],
+            "terms_text": "Copyright © Główny Urząd Geodezji i Kartografii."
+        },
         {
             "name": "Imagerie Drone (Haiti)",
             "type": "tms",
@@ -38283,6 +40274,42 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "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",
@@ -38512,7 +40539,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ]
             ],
             "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",
@@ -41013,8 +43041,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     ]
                 ]
             ],
-            "id": "kelowna_2012",
-            "default": true
+            "id": "kelowna_2012"
         },
         {
             "name": "Kelowna Roads overlay",
@@ -41445,7 +43472,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         {
             "name": "Latest southwest British Columbia Landsat",
             "type": "tms",
-            "description": "Recent lower-resolution landwsat imagery for southwest British Columbia",
+            "description": "Recent lower-resolution landsat imagery for southwest British Columbia",
             "template": "http://{switch:a,b,c,d}.tile.paulnorman.ca/landsat_047026/{zoom}/{x}/{y}.png",
             "scaleExtent": [
                 5,
@@ -41680,7 +43707,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "name": "Locator Overlay",
             "type": "tms",
             "description": "Shows major features to help orient you.",
-            "template": "http://{switch:a,b,c}.tiles.mapbox.com/v3/openstreetmap.map-btyhiati/{zoom}/{x}/{y}.png",
+            "template": "http://{switch:a,b,c}.tiles.mapbox.com/v4/openstreetmap.map-inh76ba2/{zoom}/{x}/{y}.png?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJhNVlHd29ZIn0.ti6wATGDWOmCnCYen-Ip7Q",
             "scaleExtent": [
                 0,
                 16
@@ -41691,3008 +43718,2935 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "overlay": true
         },
         {
-            "name": "MapQuest Open Aerial",
-            "type": "tms",
-            "template": "http://oatile{switch:1,2,3,4}.mqcdn.com/tiles/1.0.0/sat/{zoom}/{x}/{y}.png",
-            "default": true
-        },
-        {
-            "name": "Mapbox Satellite",
-            "type": "tms",
-            "description": "Satellite and aerial imagery.",
-            "template": "http://{switch:a,b,c}.tiles.mapbox.com/v3/openstreetmap.map-4wvf9l0l/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                0,
-                19
-            ],
-            "terms_url": "http://www.mapbox.com/about/maps/",
-            "terms_text": "Terms & Feedback",
-            "id": "Mapbox",
-            "default": true
-        },
-        {
-            "name": "NLS - Bartholomew Half Inch, 1897-1907",
+            "name": "Luxembourg Inspire Ortho 2010",
             "type": "tms",
-            "template": "http://geo.nls.uk/mapdata2/bartholomew/great_britain/{zoom}/{x}/{-y}.png",
+            "template": "http://mapproxy.openstreetmap.lu/tiles/ortho2010/EPSG900913/{z}/{x}/{y}.jpeg",
             "scaleExtent": [
                 0,
-                15
+                20
             ],
             "polygon": [
                 [
                     [
-                        -9,
-                        49.8
+                        5.961753,
+                        50.17631
                     ],
                     [
-                        -9,
-                        61.1
+                        6.026268,
+                        50.18496
                     ],
                     [
-                        1.9,
-                        61.1
+                        6.033182,
+                        50.16395
                     ],
                     [
-                        1.9,
-                        49.8
+                        6.060695,
+                        50.15536
                     ],
                     [
-                        -9,
-                        49.8
-                    ]
-                ]
-            ],
-            "terms_url": "http://geo.nls.uk/maps/",
-            "terms_text": "National Library of Scotland Historic Maps"
-        },
-        {
-            "name": "NLS - OS 1-inch 7th Series 1955-61",
-            "type": "tms",
-            "template": "http://geo.nls.uk/mapdata2/os/seventh/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                5,
-                16
-            ],
-            "polygon": [
-                [
+                        6.07668,
+                        50.15913
+                    ],
                     [
-                        -6.4585407,
-                        49.9044128
+                        6.078237,
+                        50.17255
                     ],
                     [
-                        -6.3872009,
-                        49.9841116
+                        6.101762,
+                        50.17199
                     ],
                     [
-                        -6.2296827,
-                        49.9896159
+                        6.122501,
+                        50.16437
                     ],
                     [
-                        -6.2171269,
-                        49.8680087
+                        6.120101,
+                        50.15594
                     ],
                     [
-                        -6.4551164,
-                        49.8591793
-                    ]
-                ],
-                [
+                        6.127695,
+                        50.14993
+                    ],
                     [
-                        -1.4495137,
-                        60.8634056
+                        6.113228,
+                        50.13739
                     ],
                     [
-                        -0.7167114,
-                        60.8545122
+                        6.123691,
+                        50.13719
                     ],
                     [
-                        -0.7349744,
-                        60.4359756
+                        6.140929,
+                        50.1305
                     ],
                     [
-                        -0.6938826,
-                        60.4168218
+                        6.135554,
+                        50.11899
                     ],
                     [
-                        -0.7258429,
-                        60.3942735
+                        6.138082,
+                        50.10263
                     ],
                     [
-                        -0.7395401,
-                        60.0484714
+                        6.131085,
+                        50.09964
                     ],
                     [
-                        -0.9267357,
-                        60.0461918
+                        6.135473,
+                        50.09119
                     ],
                     [
-                        -0.9381501,
-                        59.8266157
+                        6.121939,
+                        50.09059
                     ],
                     [
-                        -1.4586452,
-                        59.831205
+                        6.126335,
+                        50.07817
                     ],
                     [
-                        -1.4455187,
-                        60.0535999
+                        6.131858,
+                        50.07348
                     ],
                     [
-                        -1.463211,
-                        60.0535999
+                        6.121171,
+                        50.064
                     ],
                     [
-                        -1.4643524,
-                        60.0630002
+                        6.114444,
+                        50.06139
                     ],
                     [
-                        -1.5716475,
-                        60.0638546
+                        6.115631,
+                        50.05817
                     ],
                     [
-                        -1.5693646,
-                        60.1790005
+                        6.123611,
+                        50.06323
                     ],
                     [
-                        -1.643558,
-                        60.1807033
+                        6.136608,
+                        50.04178
                     ],
                     [
-                        -1.643558,
-                        60.1892162
+                        6.130343,
+                        50.02975
                     ],
                     [
-                        -1.8216221,
-                        60.1894999
+                        6.148207,
+                        50.02307
                     ],
                     [
-                        -1.8204807,
-                        60.3615507
+                        6.13868,
+                        50.01572
                     ],
                     [
-                        -1.8415973,
-                        60.3697345
+                        6.135938,
+                        50.01485
                     ],
                     [
-                        -1.8216221,
-                        60.3832755
+                        6.131384,
+                        50.01905
                     ],
                     [
-                        -1.8179852,
-                        60.5934321
+                        6.130243,
+                        50.01819
                     ],
                     [
-                        -1.453168,
-                        60.5934321
-                    ]
-                ],
-                [
+                        6.139343,
+                        50.01116
+                    ],
                     [
-                        -4.9089213,
-                        54.4242078
+                        6.151702,
+                        50.01058
                     ],
                     [
-                        -4.282598,
-                        54.4429861
+                        6.145464,
+                        49.99689
                     ],
                     [
-                        -4.2535417,
-                        54.029769
+                        6.139657,
+                        49.9994
                     ],
                     [
-                        -4.8766366,
-                        54.0221831
-                    ]
-                ],
-                [
+                        6.138524,
+                        49.99829
+                    ],
                     [
-                        -5.8667408,
-                        59.1444603
+                        6.142178,
+                        49.99535
                     ],
                     [
-                        -5.7759966,
-                        59.1470945
+                        6.150227,
+                        49.99518
                     ],
                     [
-                        -5.7720016,
-                        59.1014052
+                        6.156247,
+                        49.98867
                     ],
                     [
-                        -5.8621751,
-                        59.0990605
-                    ]
-                ],
-                [
+                        6.173045,
+                        49.98589
+                    ],
                     [
-                        -1.7065887,
-                        59.5703599
+                        6.17348,
+                        49.98344
                     ],
                     [
-                        -1.5579165,
-                        59.5693481
+                        6.170353,
+                        49.98376
                     ],
                     [
-                        -1.5564897,
-                        59.4965695
+                        6.165487,
+                        49.97115
                     ],
                     [
-                        -1.7054472,
-                        59.4975834
-                    ]
-                ],
-                [
+                        6.171512,
+                        49.96298
+                    ],
                     [
-                        -7.6865827,
-                        58.2940975
+                        6.176298,
+                        49.962
                     ],
                     [
-                        -7.5330594,
-                        58.3006957
+                        6.179954,
+                        49.95386
                     ],
                     [
-                        -7.5256401,
-                        58.2646905
+                        6.183393,
+                        49.9548
                     ],
                     [
-                        -7.6797341,
-                        58.2577853
-                    ]
-                ],
-                [
+                        6.179829,
+                        49.96307
+                    ],
                     [
-                        -4.5338281,
-                        59.0359871
+                        6.183312,
+                        49.9686
                     ],
                     [
-                        -4.481322,
-                        59.0371616
+                        6.192774,
+                        49.97158
                     ],
                     [
-                        -4.4796099,
-                        59.0186583
+                        6.199783,
+                        49.95352
                     ],
                     [
-                        -4.5332574,
-                        59.0180707
-                    ]
-                ],
-                [
+                        6.207066,
+                        49.95672
+                    ],
                     [
-                        -8.6710698,
-                        57.8769896
+                        6.212689,
+                        49.9514
                     ],
                     [
-                        -8.4673234,
-                        57.8897332
+                        6.225023,
+                        49.95039
                     ],
                     [
-                        -8.4467775,
-                        57.7907
+                        6.22044,
+                        49.94369
                     ],
                     [
-                        -8.6510947,
-                        57.7779213
-                    ]
-                ],
-                [
+                        6.228241,
+                        49.93726
+                    ],
                     [
-                        -5.2395519,
-                        50.3530581
+                        6.22635,
+                        49.92766
                     ],
                     [
-                        -5.7920073,
-                        50.3384899
+                        6.219133,
+                        49.92354
                     ],
                     [
-                        -5.760047,
-                        49.9317027
+                        6.229862,
+                        49.92125
                     ],
                     [
-                        -4.6551363,
-                        49.9581461
+                        6.236032,
+                        49.91355
                     ],
                     [
-                        -4.677965,
-                        50.2860073
+                        6.231867,
+                        49.91064
                     ],
                     [
-                        -4.244219,
-                        50.2801723
+                        6.227694,
+                        49.91062
                     ],
                     [
-                        -4.2487848,
-                        50.2042525
+                        6.232286,
+                        49.9072
                     ],
                     [
-                        -3.3812929,
-                        50.2042525
+                        6.23381,
+                        49.90028
                     ],
                     [
-                        -3.4223846,
-                        50.5188201
+                        6.246919,
+                        49.89535
                     ],
                     [
-                        -3.1164796,
-                        50.5246258
+                        6.257809,
+                        49.88724
                     ],
                     [
-                        -3.1210453,
-                        50.6579592
+                        6.263008,
+                        49.88101
                     ],
                     [
-                        -2.6736357,
-                        50.6619495
+                        6.276455,
+                        49.87725
                     ],
                     [
-                        -2.5953453,
-                        50.6394325
+                        6.281126,
+                        49.87957
                     ],
                     [
-                        -2.5905026,
-                        50.5728419
+                        6.291661,
+                        49.87548
                     ],
                     [
-                        -2.4791203,
-                        50.5733545
+                        6.297699,
+                        49.86673
                     ],
                     [
-                        -2.4758919,
-                        50.5066704
+                        6.309889,
+                        49.87107
                     ],
                     [
-                        -2.3967943,
-                        50.5056438
+                        6.315324,
+                        49.8673
                     ],
                     [
-                        -2.401637,
-                        50.5723293
+                        6.314651,
+                        49.86057
                     ],
                     [
-                        -1.0400296,
-                        50.5718167
+                        6.323611,
+                        49.85188
                     ],
                     [
-                        -1.0335726,
-                        50.7059289
+                        6.321577,
+                        49.8409
                     ],
                     [
-                        -0.549302,
-                        50.7038843
+                        6.327406,
+                        49.83673
                     ],
                     [
-                        -0.5460736,
-                        50.7886618
+                        6.336561,
+                        49.83998
                     ],
                     [
-                        -0.0924734,
-                        50.7856002
+                        6.339366,
+                        49.8507
                     ],
                     [
-                        -0.0876307,
-                        50.7181949
+                        6.364651,
+                        49.85164
                     ],
                     [
-                        0.4789659,
-                        50.7120623
+                        6.402203,
+                        49.82098
                     ],
                     [
-                        0.487037,
-                        50.8182467
+                        6.426434,
+                        49.81629
                     ],
                     [
-                        0.9761503,
-                        50.8049868
+                        6.428071,
+                        49.81186
                     ],
                     [
-                        0.9922927,
-                        51.0126311
+                        6.43097,
+                        49.81129
                     ],
                     [
-                        1.4491213,
-                        51.0004424
+                        6.441608,
+                        49.81547
                     ],
                     [
-                        1.4781775,
-                        51.4090372
+                        6.443442,
+                        49.81233
                     ],
                     [
-                        1.0229632,
-                        51.4271576
+                        6.45366,
+                        49.81275
                     ],
                     [
-                        1.035877,
-                        51.7640881
+                        6.464538,
+                        49.81975
                     ],
                     [
-                        1.6105448,
-                        51.7500992
+                        6.47057,
+                        49.82385
                     ],
                     [
-                        1.646058,
-                        52.1560003
+                        6.496805,
+                        49.81277
                     ],
                     [
-                        1.7267698,
-                        52.1540195
+                        6.50669,
+                        49.80993
                     ],
                     [
-                        1.749369,
-                        52.4481811
+                        6.511554,
+                        49.80238
                     ],
                     [
-                        1.7870672,
-                        52.4811624
+                        6.51485,
+                        49.80513
                     ],
                     [
-                        1.759102,
-                        52.522505
+                        6.519604,
+                        49.81446
                     ],
                     [
-                        1.7933451,
-                        52.9602749
+                        6.529808,
+                        49.81048
                     ],
                     [
-                        0.3798147,
-                        52.9958468
+                        6.532249,
+                        49.80686
                     ],
                     [
-                        0.3895238,
-                        53.2511239
+                        6.530829,
+                        49.80116
                     ],
                     [
-                        0.3478614,
-                        53.2511239
+                        6.506225,
+                        49.78899
                     ],
                     [
-                        0.3238912,
-                        53.282186
+                        6.519171,
+                        49.78344
                     ],
                     [
-                        0.3461492,
-                        53.6538501
+                        6.511055,
+                        49.77422
                     ],
                     [
-                        0.128487,
-                        53.6575466
+                        6.520563,
+                        49.76818
                     ],
                     [
-                        0.116582,
-                        53.6674703
+                        6.520516,
+                        49.76134
                     ],
                     [
-                        0.1350586,
-                        54.0655731
+                        6.503734,
+                        49.75086
                     ],
                     [
-                        -0.0609831,
-                        54.065908
+                        6.502627,
+                        49.73298
                     ],
                     [
-                        -0.0414249,
-                        54.4709448
+                        6.507266,
+                        49.72938
                     ],
                     [
-                        -0.5662701,
-                        54.4771794
+                        6.518092,
+                        49.7242
                     ],
                     [
-                        -0.5592078,
-                        54.6565127
+                        6.516417,
+                        49.72129
                     ],
                     [
-                        -1.1665638,
-                        54.6623485
+                        6.511763,
+                        49.72016
                     ],
                     [
-                        -1.1637389,
-                        54.842611
+                        6.504791,
+                        49.725
                     ],
                     [
-                        -1.3316194,
-                        54.843909
+                        6.498913,
+                        49.72639
                     ],
                     [
-                        -1.3257065,
-                        55.2470842
+                        6.495576,
+                        49.72443
                     ],
                     [
-                        -1.529453,
-                        55.2487108
+                        6.507122,
+                        49.71655
                     ],
                     [
-                        -1.524178,
-                        55.6540122
+                        6.507884,
+                        49.71215
                     ],
                     [
-                        -1.7638798,
-                        55.6540122
+                        6.504598,
+                        49.71227
                     ],
                     [
-                        -1.7733693,
-                        55.9719116
+                        6.427139,
+                        49.66237
                     ],
                     [
-                        -2.1607858,
-                        55.9682981
+                        6.439899,
+                        49.66025
                     ],
                     [
-                        -2.1543289,
-                        56.0621387
+                        6.442511,
+                        49.65591
                     ],
                     [
-                        -2.4578051,
-                        56.0585337
+                        6.421781,
+                        49.61809
                     ],
                     [
-                        -2.4190635,
-                        56.641717
+                        6.398978,
+                        49.60094
                     ],
                     [
-                        -2.0962164,
-                        56.641717
+                        6.379408,
+                        49.59526
                     ],
                     [
-                        -2.0833025,
-                        57.0021322
+                        6.375507,
+                        49.58809
                     ],
                     [
-                        -1.9283359,
-                        57.0126802
+                        6.384426,
+                        49.5801
                     ],
                     [
-                        -1.9180966,
-                        57.3590895
+                        6.381188,
+                        49.57509
                     ],
                     [
-                        -1.7502161,
-                        57.3625721
+                        6.369093,
+                        49.5783
                     ],
                     [
-                        -1.7695869,
-                        57.7608634
+                        6.357913,
+                        49.57166
                     ],
                     [
-                        -3.6937554,
-                        57.7574187
+                        6.384902,
+                        49.55817
                     ],
                     [
-                        -3.7066693,
-                        57.9806386
+                        6.380095,
+                        49.54856
                     ],
                     [
-                        -3.5969013,
-                        57.9772149
+                        6.358555,
+                        49.53296
                     ],
                     [
-                        -3.6033582,
-                        58.1207277
+                        6.359322,
+                        49.52481
                     ],
                     [
-                        -3.0222335,
-                        58.1309566
+                        6.370763,
+                        49.50545
                     ],
                     [
-                        -3.0286905,
-                        58.5410788
+                        6.370562,
+                        49.45732
                     ],
                     [
-                        -2.8478961,
-                        58.530968
+                        6.333403,
+                        49.46493
                     ],
                     [
-                        -2.86081,
-                        58.8430508
+                        6.321894,
+                        49.47244
                     ],
                     [
-                        -2.679624,
-                        58.8414991
+                        6.295034,
+                        49.47928
                     ],
                     [
-                        -2.6841897,
-                        58.885175
+                        6.287889,
+                        49.48379
                     ],
                     [
-                        -2.6339665,
-                        58.9052239
+                        6.271912,
+                        49.49995
                     ],
                     [
-                        -2.679624,
-                        58.9335083
+                        6.241327,
+                        49.50693
                     ],
                     [
-                        -2.6887555,
-                        59.0229231
+                        6.196692,
+                        49.50331
                     ],
                     [
-                        -2.3668703,
-                        59.0229231
+                        6.173373,
+                        49.50577
                     ],
                     [
-                        -2.3702946,
-                        59.2652861
+                        6.160858,
+                        49.50085
                     ],
                     [
-                        -2.3429001,
-                        59.2821989
+                        6.167099,
+                        49.49006
                     ],
                     [
-                        -2.3714361,
-                        59.2996861
+                        6.140179,
+                        49.48525
                     ],
                     [
-                        -2.3737189,
-                        59.3707083
+                        6.129367,
+                        49.48803
                     ],
                     [
-                        -2.3429001,
-                        59.385825
+                        6.127247,
+                        49.47081
                     ],
                     [
-                        -2.3725775,
-                        59.400354
+                        6.101403,
+                        49.46726
                     ],
                     [
-                        -2.3714361,
-                        59.4259098
+                        6.104826,
+                        49.45076
                     ],
                     [
-                        -3.0734196,
-                        59.4230067
+                        6.081667,
+                        49.45417
                     ],
                     [
-                        -3.0711368,
-                        59.3433649
+                        6.077222,
+                        49.46139
                     ],
                     [
-                        -3.103097,
-                        59.3311405
+                        6.059167,
+                        49.46306
                     ],
                     [
-                        -3.0745611,
-                        59.3136695
+                        6.052222,
+                        49.46028
                     ],
                     [
-                        -3.0722782,
-                        59.232603
+                        6.044213,
+                        49.44553
                     ],
                     [
-                        -3.3850319,
-                        59.1484167
+                        6.025294,
+                        49.44703
                     ],
                     [
-                        -3.3747589,
-                        58.9352753
+                        6.021545,
+                        49.45127
                     ],
                     [
-                        -3.5653789,
-                        58.9323303
+                        6.01574,
+                        49.44885
                     ],
                     [
-                        -3.554829,
-                        58.69759
+                        5.994123,
+                        49.45301
                     ],
                     [
-                        -5.2808579,
-                        58.6667732
+                        5.976569,
+                        49.44885
                     ],
                     [
-                        -5.2534159,
-                        58.3514125
+                        5.977725,
+                        49.45955
                     ],
                     [
-                        -5.5068508,
-                        58.3437887
+                        5.972317,
+                        49.46087
                     ],
                     [
-                        -5.4761804,
-                        58.0323557
+                        5.968912,
+                        49.48202
                     ],
                     [
-                        -5.8974958,
-                        58.0212436
+                        5.9616,
+                        49.49026
                     ],
                     [
-                        -5.8522972,
-                        57.6171758
+                        5.915781,
+                        49.49835
                     ],
                     [
-                        -6.1396311,
-                        57.6137174
+                        5.890334,
+                        49.4948
                     ],
                     [
-                        -6.1541592,
-                        57.7423183
+                        5.863321,
+                        49.50006
                     ],
                     [
-                        -6.2913692,
-                        57.7380102
+                        5.84897,
+                        49.50826
                     ],
                     [
-                        -6.3365678,
-                        58.1398784
+                        5.84828,
+                        49.51397
                     ],
                     [
-                        -6.1121891,
-                        58.1466944
+                        5.83641,
+                        49.51817
                     ],
                     [
-                        -6.1473778,
-                        58.5106285
+                        5.831868,
+                        49.52639
                     ],
                     [
-                        -6.2934817,
-                        58.5416182
+                        5.84308,
+                        49.53081
                     ],
                     [
-                        -6.8413713,
-                        58.2977321
+                        5.835622,
+                        49.54114
                     ],
                     [
-                        -7.0057382,
-                        58.2929331
+                        5.816251,
+                        49.53325
                     ],
                     [
-                        -7.1016189,
-                        58.2064403
+                        5.805201,
+                        49.54272
                     ],
                     [
-                        -7.2573132,
-                        58.1793148
+                        5.859432,
+                        49.57158
                     ],
                     [
-                        -7.2531092,
-                        58.1004928
+                        5.868663,
+                        49.587
                     ],
                     [
-                        -7.4070698,
-                        58.0905566
+                        5.862888,
+                        49.58525
                     ],
                     [
-                        -7.391347,
-                        57.7911354
+                        5.851102,
+                        49.58379
                     ],
                     [
-                        -7.790991,
-                        57.7733151
+                        5.847116,
+                        49.58961
                     ],
                     [
-                        -7.7624215,
-                        57.5444165
+                        5.845652,
+                        49.5981
                     ],
                     [
-                        -7.698501,
-                        57.1453194
+                        5.869401,
+                        49.6106
                     ],
                     [
-                        -7.7943817,
-                        57.1304547
+                        5.881819,
+                        49.63815
                     ],
                     [
-                        -7.716764,
-                        56.7368628
+                        5.899978,
+                        49.63907
                     ],
                     [
-                        -7.0122067,
-                        56.7654359
+                        5.899339,
+                        49.66239
                     ],
                     [
-                        -6.979922,
-                        56.5453858
+                        5.856561,
+                        49.67628
                     ],
                     [
-                        -7.0638622,
-                        56.5453858
+                        5.856283,
+                        49.68211
                     ],
                     [
-                        -7.0444914,
-                        56.3562587
+                        5.875703,
+                        49.71118
                     ],
                     [
-                        -6.500676,
-                        56.3812917
+                        5.864811,
+                        49.72331
                     ],
                     [
-                        -6.4491433,
-                        55.9793649
+                        5.843249,
+                        49.71822
                     ],
                     [
-                        -6.563287,
-                        55.9691456
+                        5.82191,
+                        49.72128
                     ],
                     [
-                        -6.5393742,
-                        55.7030135
+                        5.824894,
+                        49.73767
                     ],
                     [
-                        -6.5595521,
-                        55.6907321
+                        5.820728,
+                        49.74878
                     ],
                     [
-                        -6.5345315,
-                        55.6761713
+                        5.786264,
+                        49.79079
                     ],
                     [
-                        -6.5216176,
-                        55.5704434
+                        5.765172,
+                        49.78961
                     ],
                     [
-                        -5.8912587,
-                        55.5923416
+                        5.750937,
+                        49.79094
                     ],
                     [
-                        -5.8560127,
-                        55.2320733
+                        5.741591,
+                        49.82126
                     ],
                     [
-                        -5.2293639,
-                        55.2515958
+                        5.745814,
+                        49.82435
                     ],
                     [
-                        -5.1837064,
-                        54.6254139
+                        5.737197,
+                        49.83353
                     ],
                     [
-                        -3.6655956,
-                        54.6518373
+                        5.740531,
+                        49.84142
                     ],
                     [
-                        -3.6496155,
-                        54.4320023
+                        5.747012,
+                        49.84048
                     ],
                     [
-                        -3.5400375,
-                        54.4306744
+                        5.746237,
+                        49.84783
                     ],
                     [
-                        -3.530906,
-                        54.0290181
+                        5.753989,
+                        49.84878
                     ],
                     [
-                        -3.0697656,
-                        54.030359
+                        5.740663,
+                        49.85152
                     ],
                     [
-                        -3.0675737,
-                        53.8221388
+                        5.752288,
+                        49.85922
                     ],
                     [
-                        -3.0804876,
-                        53.7739911
+                        5.749545,
+                        49.87554
                     ],
                     [
-                        -3.0619239,
-                        53.7477488
+                        5.775668,
+                        49.87438
                     ],
                     [
-                        -3.0611168,
-                        53.6737049
+                        5.775053,
+                        49.88057
                     ],
                     [
-                        -3.2144691,
-                        53.6708361
+                        5.734598,
+                        49.89341
                     ],
                     [
-                        -3.2057699,
-                        53.4226163
+                        5.733033,
+                        49.90285
                     ],
                     [
-                        -3.2799632,
-                        53.355224
+                        5.757834,
+                        49.91737
                     ],
                     [
-                        -3.2896655,
-                        53.3608441
+                        5.760393,
+                        49.93252
                     ],
                     [
-                        -3.3327547,
-                        53.364931
+                        5.770728,
+                        49.93711
                     ],
                     [
-                        -3.3761293,
-                        53.3540318
+                        5.768783,
+                        49.94239
                     ],
                     [
-                        -4.0888976,
-                        53.3433102
+                        5.768802,
+                        49.96104
                     ],
                     [
-                        -4.0945474,
-                        53.4612036
+                        5.786724,
+                        49.96816
                     ],
                     [
-                        -4.697412,
-                        53.4448624
+                        5.80524,
+                        49.96677
                     ],
                     [
-                        -4.6882805,
-                        53.3318598
+                        5.806521,
+                        49.97321
                     ],
                     [
-                        -4.7202407,
-                        53.2895771
+                        5.831293,
+                        49.97995
                     ],
                     [
-                        -4.6837148,
-                        53.2486184
+                        5.834616,
+                        49.98656
                     ],
                     [
-                        -4.6768661,
-                        53.1542644
+                        5.818057,
+                        49.99936
                     ],
                     [
-                        -4.8480816,
-                        53.1446807
+                        5.815606,
+                        50.01437
                     ],
                     [
-                        -4.8178336,
-                        52.7440299
+                        5.847923,
+                        50.02809
                     ],
                     [
-                        -4.2545751,
-                        52.7558939
+                        5.861889,
+                        50.04581
                     ],
                     [
-                        -4.228876,
-                        52.254876
+                        5.850872,
+                        50.0563
                     ],
                     [
-                        -4.2607571,
-                        52.2536408
+                        5.857809,
+                        50.07186
                     ],
                     [
-                        -4.2724603,
-                        52.2432637
+                        5.880997,
+                        50.08069
                     ],
                     [
-                        -4.8136263,
-                        52.230095
+                        5.891965,
+                        50.12041
                     ],
                     [
-                        -4.8079191,
-                        52.1138892
+                        5.952856,
+                        50.13384
                     ],
                     [
-                        -5.3889104,
-                        52.0991668
+                        5.961753,
+                        50.17631
+                    ]
+                ]
+            ],
+            "terms_url": "http://www.act.public.lu/fr/actualites/2014/02/ortho2014/",
+            "terms_text": "Administration du Cadastre et de la Topographie",
+            "id": "lu.geoportail.inspire.ortho2010"
+        },
+        {
+            "name": "Luxembourg Inspire Ortho 2013",
+            "type": "tms",
+            "template": "http://mapproxy.openstreetmap.lu/tiles/ortho2013/EPSG900913/{z}/{x}/{y}.jpeg",
+            "scaleExtent": [
+                0,
+                20
+            ],
+            "polygon": [
+                [
+                    [
+                        5.961753,
+                        50.17631
                     ],
                     [
-                        -5.3717888,
-                        51.9129667
+                        6.026268,
+                        50.18496
                     ],
                     [
-                        -5.4208706,
-                        51.9101502
+                        6.033182,
+                        50.16395
                     ],
                     [
-                        -5.414022,
-                        51.8453218
+                        6.060695,
+                        50.15536
                     ],
                     [
-                        -5.3683645,
-                        51.8474373
+                        6.07668,
+                        50.15913
                     ],
                     [
-                        -5.3466772,
-                        51.5595332
+                        6.078237,
+                        50.17255
                     ],
                     [
-                        -4.773676,
-                        51.5758518
+                        6.101762,
+                        50.17199
                     ],
                     [
-                        -4.7656859,
-                        51.4885146
+                        6.122501,
+                        50.16437
                     ],
                     [
-                        -4.1915432,
-                        51.4970427
+                        6.120101,
+                        50.15594
                     ],
                     [
-                        -4.1869775,
-                        51.4344663
+                        6.127695,
+                        50.14993
                     ],
                     [
-                        -3.6151177,
-                        51.4444274
+                        6.113228,
+                        50.13739
                     ],
                     [
-                        -3.6105519,
-                        51.3746543
+                        6.123691,
+                        50.13719
                     ],
                     [
-                        -3.1494115,
-                        51.3789292
+                        6.140929,
+                        50.1305
                     ],
                     [
-                        -3.1494115,
-                        51.2919281
+                        6.135554,
+                        50.11899
                     ],
                     [
-                        -4.3038735,
-                        51.2745907
+                        6.138082,
+                        50.10263
                     ],
                     [
-                        -4.2861169,
-                        51.0508721
+                        6.131085,
+                        50.09964
                     ],
                     [
-                        -4.8543277,
-                        51.0366633
+                        6.135473,
+                        50.09119
                     ],
                     [
-                        -4.8372201,
-                        50.7212787
+                        6.121939,
+                        50.09059
                     ],
                     [
-                        -5.2618345,
-                        50.7082694
-                    ]
-                ],
-                [
+                        6.126335,
+                        50.07817
+                    ],
                     [
-                        -2.1502671,
-                        60.171318
+                        6.131858,
+                        50.07348
                     ],
                     [
-                        -2.0030218,
-                        60.1696146
+                        6.121171,
+                        50.064
                     ],
                     [
-                        -2.0013096,
-                        60.0997023
+                        6.114444,
+                        50.06139
                     ],
                     [
-                        -2.148555,
-                        60.1011247
-                    ]
-                ],
-                [
+                        6.115631,
+                        50.05817
+                    ],
                     [
-                        -6.2086011,
-                        59.1163488
+                        6.123611,
+                        50.06323
                     ],
                     [
-                        -6.1229934,
-                        59.1166418
+                        6.136608,
+                        50.04178
                     ],
                     [
-                        -6.121852,
-                        59.0714985
+                        6.130343,
+                        50.02975
                     ],
                     [
-                        -6.2097426,
-                        59.0714985
-                    ]
-                ],
-                [
+                        6.148207,
+                        50.02307
+                    ],
                     [
-                        -4.4159559,
-                        59.0889036
+                        6.13868,
+                        50.01572
                     ],
                     [
-                        -4.4212022,
-                        59.0770848
+                        6.135938,
+                        50.01485
                     ],
                     [
-                        -4.3971904,
-                        59.0779143
+                        6.131384,
+                        50.01905
                     ],
                     [
-                        -4.3913388,
-                        59.0897328
-                    ]
-                ]
-            ],
-            "terms_url": "http://geo.nls.uk/maps/",
-            "terms_text": "National Library of Scotland Historic Maps"
-        },
-        {
-            "name": "NLS - OS 1:25k 1st Series 1937-61",
-            "type": "tms",
-            "template": "http://geo.nls.uk/mapdata2/os/25000/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                5,
-                16
-            ],
-            "polygon": [
-                [
+                        6.130243,
+                        50.01819
+                    ],
                     [
-                        -4.7157244,
-                        54.6796556
+                        6.139343,
+                        50.01116
                     ],
                     [
-                        -4.6850662,
-                        54.6800268
+                        6.151702,
+                        50.01058
                     ],
                     [
-                        -4.6835779,
-                        54.6623245
+                        6.145464,
+                        49.99689
                     ],
                     [
-                        -4.7148782,
-                        54.6615818
-                    ]
-                ],
-                [
+                        6.139657,
+                        49.9994
+                    ],
                     [
-                        -3.7085748,
-                        58.3371151
+                        6.138524,
+                        49.99829
                     ],
                     [
-                        -3.5405937,
-                        58.3380684
+                        6.142178,
+                        49.99535
                     ],
                     [
-                        -3.5315137,
-                        58.1608002
+                        6.150227,
+                        49.99518
                     ],
                     [
-                        -3.3608086,
-                        58.1622372
+                        6.156247,
+                        49.98867
                     ],
                     [
-                        -3.3653486,
-                        58.252173
+                        6.173045,
+                        49.98589
                     ],
                     [
-                        -3.1610473,
-                        58.2536063
+                        6.17348,
+                        49.98344
                     ],
                     [
-                        -3.1610473,
-                        58.3261509
+                        6.170353,
+                        49.98376
                     ],
                     [
-                        -3.0275704,
-                        58.3271045
+                        6.165487,
+                        49.97115
                     ],
                     [
-                        -3.0366505,
-                        58.6139001
+                        6.171512,
+                        49.96298
                     ],
                     [
-                        -3.0021463,
-                        58.614373
+                        6.176298,
+                        49.962
                     ],
                     [
-                        -3.0030543,
-                        58.7036341
+                        6.179954,
+                        49.95386
                     ],
                     [
-                        -3.4180129,
-                        58.7003322
+                        6.183393,
+                        49.9548
                     ],
                     [
-                        -3.4171049,
-                        58.6290293
+                        6.179829,
+                        49.96307
                     ],
                     [
-                        -3.7240109,
-                        58.6266658
+                        6.183312,
+                        49.9686
                     ],
                     [
-                        -3.7231029,
-                        58.606806
+                        6.192774,
+                        49.97158
                     ],
                     [
-                        -4.2361262,
-                        58.5992374
+                        6.199783,
+                        49.95352
                     ],
                     [
-                        -4.2334022,
-                        58.5092347
+                        6.207066,
+                        49.95672
                     ],
                     [
-                        -3.88836,
-                        58.5144516
+                        6.212689,
+                        49.9514
                     ],
                     [
-                        -3.8829119,
-                        58.4261327
+                        6.225023,
+                        49.95039
                     ],
                     [
-                        -3.7158389,
-                        58.4270836
-                    ]
-                ],
-                [
+                        6.22044,
+                        49.94369
+                    ],
                     [
-                        -6.46676,
-                        49.9943621
+                        6.228241,
+                        49.93726
                     ],
                     [
-                        -6.1889102,
-                        50.004868
+                        6.22635,
+                        49.92766
                     ],
                     [
-                        -6.1789222,
-                        49.8967815
+                        6.219133,
+                        49.92354
                     ],
                     [
-                        -6.3169391,
-                        49.8915171
+                        6.229862,
+                        49.92125
                     ],
                     [
-                        -6.312399,
-                        49.8200979
+                        6.236032,
+                        49.91355
                     ],
                     [
-                        -6.4504159,
-                        49.8159968
-                    ]
-                ],
-                [
+                        6.231867,
+                        49.91064
+                    ],
                     [
-                        -5.6453263,
-                        50.2029809
+                        6.227694,
+                        49.91062
                     ],
                     [
-                        -5.7801329,
-                        50.2014076
+                        6.232286,
+                        49.9072
                     ],
                     [
-                        -5.7637888,
-                        50.0197267
+                        6.23381,
+                        49.90028
                     ],
                     [
-                        -5.3479221,
-                        50.0290604
+                        6.246919,
+                        49.89535
                     ],
                     [
-                        -5.3388421,
-                        49.9414854
+                        6.257809,
+                        49.88724
                     ],
                     [
-                        -5.024672,
-                        49.9473287
+                        6.263008,
+                        49.88101
                     ],
                     [
-                        -5.0355681,
-                        50.0383923
+                        6.276455,
+                        49.87725
                     ],
                     [
-                        -5.0010639,
-                        50.0453901
+                        6.281126,
+                        49.87957
                     ],
                     [
-                        -4.9974319,
-                        50.1304478
+                        6.291661,
+                        49.87548
                     ],
                     [
-                        -4.855783,
-                        50.13394
+                        6.297699,
+                        49.86673
                     ],
                     [
-                        -4.861231,
-                        50.206057
+                        6.309889,
+                        49.87107
                     ],
                     [
-                        -4.6546085,
-                        50.2140172
+                        6.315324,
+                        49.8673
                     ],
                     [
-                        -4.6558926,
-                        50.3018616
+                        6.314651,
+                        49.86057
                     ],
                     [
-                        -4.5184924,
-                        50.3026818
+                        6.323611,
+                        49.85188
                     ],
                     [
-                        -4.51464,
-                        50.325642
+                        6.321577,
+                        49.8409
                     ],
                     [
-                        -4.2488284,
-                        50.3264618
+                        6.327406,
+                        49.83673
                     ],
                     [
-                        -4.2488284,
-                        50.3100631
+                        6.336561,
+                        49.83998
                     ],
                     [
-                        -4.10886,
-                        50.3141633
+                        6.339366,
+                        49.8507
                     ],
                     [
-                        -4.1062917,
-                        50.2411267
+                        6.364651,
+                        49.85164
                     ],
                     [
-                        -3.9648088,
-                        50.2432047
+                        6.402203,
+                        49.82098
                     ],
                     [
-                        -3.9640778,
-                        50.2254158
+                        6.426434,
+                        49.81629
                     ],
                     [
-                        -3.8522287,
-                        50.2273626
+                        6.428071,
+                        49.81186
                     ],
                     [
-                        -3.8503757,
-                        50.1552563
+                        6.43097,
+                        49.81129
                     ],
                     [
-                        -3.6921809,
-                        50.1572487
+                        6.441608,
+                        49.81547
                     ],
                     [
-                        -3.5414602,
-                        50.1602198
+                        6.443442,
+                        49.81233
                     ],
                     [
-                        -3.5465781,
-                        50.3226814
+                        6.45366,
+                        49.81275
                     ],
                     [
-                        -3.4068012,
-                        50.3241013
+                        6.464538,
+                        49.81975
                     ],
                     [
-                        -3.4165761,
-                        50.5892711
+                        6.47057,
+                        49.82385
                     ],
                     [
-                        -3.2746691,
-                        50.5962721
+                        6.496805,
+                        49.81277
                     ],
                     [
-                        -3.2749172,
-                        50.6106323
+                        6.50669,
+                        49.80993
                     ],
                     [
-                        -2.9971742,
-                        50.613972
+                        6.511554,
+                        49.80238
                     ],
                     [
-                        -2.9896008,
-                        50.688537
+                        6.51485,
+                        49.80513
                     ],
                     [
-                        -2.7120266,
-                        50.690565
+                        6.519604,
+                        49.81446
                     ],
                     [
-                        -2.710908,
-                        50.6195964
+                        6.529808,
+                        49.81048
                     ],
                     [
-                        -2.5695473,
-                        50.6157538
+                        6.532249,
+                        49.80686
                     ],
                     [
-                        -2.5651019,
-                        50.5134083
+                        6.530829,
+                        49.80116
                     ],
                     [
-                        -2.4014463,
-                        50.513379
+                        6.506225,
+                        49.78899
                     ],
                     [
-                        -2.3940583,
-                        50.6160348
+                        6.519171,
+                        49.78344
                     ],
                     [
-                        -2.2894123,
-                        50.6147436
+                        6.511055,
+                        49.77422
                     ],
                     [
-                        -2.2876184,
-                        50.6008549
+                        6.520563,
+                        49.76818
                     ],
                     [
-                        -2.1477855,
-                        50.6048506
+                        6.520516,
+                        49.76134
                     ],
                     [
-                        -2.1451013,
-                        50.5325437
+                        6.503734,
+                        49.75086
                     ],
                     [
-                        -1.9335117,
-                        50.5347477
+                        6.502627,
+                        49.73298
                     ],
                     [
-                        -1.9362139,
-                        50.6170445
+                        6.507266,
+                        49.72938
                     ],
                     [
-                        -1.8573025,
-                        50.6228094
+                        6.518092,
+                        49.7242
                     ],
                     [
-                        -1.8554865,
-                        50.709139
+                        6.516417,
+                        49.72129
                     ],
                     [
-                        -1.6066929,
-                        50.709139
+                        6.511763,
+                        49.72016
                     ],
                     [
-                        -1.6085089,
-                        50.6239615
+                        6.504791,
+                        49.725
                     ],
                     [
-                        -1.4450678,
-                        50.6228094
+                        6.498913,
+                        49.72639
                     ],
                     [
-                        -1.4432518,
-                        50.5317039
+                        6.495576,
+                        49.72443
                     ],
                     [
-                        -1.1545059,
-                        50.5293951
+                        6.507122,
+                        49.71655
                     ],
                     [
-                        -1.1472419,
-                        50.6170485
+                        6.507884,
+                        49.71215
                     ],
                     [
-                        -1.011041,
-                        50.6205051
+                        6.504598,
+                        49.71227
                     ],
                     [
-                        -1.011041,
-                        50.7056889
+                        6.427139,
+                        49.66237
                     ],
                     [
-                        -0.704135,
-                        50.7045388
+                        6.439899,
+                        49.66025
                     ],
                     [
-                        -0.700503,
-                        50.7769401
+                        6.442511,
+                        49.65591
                     ],
                     [
-                        -0.5860943,
-                        50.7723465
+                        6.421781,
+                        49.61809
                     ],
                     [
-                        -0.5879103,
-                        50.7907181
+                        6.398978,
+                        49.60094
                     ],
                     [
-                        -0.0149586,
-                        50.7798108
+                        6.379408,
+                        49.59526
                     ],
                     [
-                        -0.0185906,
-                        50.7625836
+                        6.375507,
+                        49.58809
                     ],
                     [
-                        0.0967261,
-                        50.7620093
+                        6.384426,
+                        49.5801
                     ],
                     [
-                        0.0921861,
-                        50.6913106
+                        6.381188,
+                        49.57509
                     ],
                     [
-                        0.3046595,
-                        50.6890096
+                        6.369093,
+                        49.5783
                     ],
                     [
-                        0.3101075,
-                        50.7757917
+                        6.357913,
+                        49.57166
                     ],
                     [
-                        0.5511831,
-                        50.7726336
+                        6.384902,
+                        49.55817
                     ],
                     [
-                        0.5529991,
-                        50.8432096
+                        6.380095,
+                        49.54856
                     ],
                     [
-                        0.695556,
-                        50.8403428
+                        6.358555,
+                        49.53296
                     ],
                     [
-                        0.696464,
-                        50.8592608
+                        6.359322,
+                        49.52481
                     ],
                     [
-                        0.9852099,
-                        50.8523824
+                        6.370763,
+                        49.50545
                     ],
                     [
-                        0.9906579,
-                        50.9417226
+                        6.370562,
+                        49.45732
                     ],
                     [
-                        1.0160821,
-                        50.9411504
+                        6.333403,
+                        49.46493
                     ],
                     [
-                        1.0215301,
-                        51.0303204
+                        6.321894,
+                        49.47244
                     ],
                     [
-                        1.2812198,
-                        51.0240383
+                        6.295034,
+                        49.47928
                     ],
                     [
-                        1.2848518,
-                        51.0948044
+                        6.287889,
+                        49.48379
                     ],
                     [
-                        1.4277848,
-                        51.0948044
+                        6.271912,
+                        49.49995
                     ],
                     [
-                        1.4386809,
-                        51.2882859
+                        6.241327,
+                        49.50693
                     ],
                     [
-                        1.4713691,
-                        51.2871502
+                        6.196692,
+                        49.50331
                     ],
                     [
-                        1.4804492,
-                        51.3994534
+                        6.173373,
+                        49.50577
                     ],
                     [
-                        1.1590151,
-                        51.4073836
+                        6.160858,
+                        49.50085
                     ],
                     [
-                        1.1590151,
-                        51.3869889
+                        6.167099,
+                        49.49006
                     ],
                     [
-                        1.0191822,
-                        51.3903886
+                        6.140179,
+                        49.48525
                     ],
                     [
-                        1.0228142,
-                        51.4798247
+                        6.129367,
+                        49.48803
                     ],
                     [
-                        0.8793493,
-                        51.4843484
+                        6.127247,
+                        49.47081
                     ],
                     [
-                        0.8829813,
-                        51.5566675
+                        6.101403,
+                        49.46726
                     ],
                     [
-                        1.0264462,
-                        51.5544092
+                        6.104826,
+                        49.45076
                     ],
                     [
-                        1.0373423,
-                        51.7493319
+                        6.081667,
+                        49.45417
                     ],
                     [
-                        1.2607117,
-                        51.7482076
+                        6.077222,
+                        49.46139
                     ],
                     [
-                        1.2661598,
-                        51.8279642
+                        6.059167,
+                        49.46306
                     ],
                     [
-                        1.3351682,
-                        51.8335756
+                        6.052222,
+                        49.46028
                     ],
                     [
-                        1.3478803,
-                        51.9199021
+                        6.044213,
+                        49.44553
                     ],
                     [
-                        1.4840812,
-                        51.9199021
+                        6.025294,
+                        49.44703
                     ],
                     [
-                        1.4986093,
-                        52.0038271
+                        6.021545,
+                        49.45127
                     ],
                     [
-                        1.6438902,
-                        52.0027092
+                        6.01574,
+                        49.44885
                     ],
                     [
-                        1.6656823,
-                        52.270221
+                        5.994123,
+                        49.45301
                     ],
                     [
-                        1.7310588,
-                        52.270221
+                        5.976569,
+                        49.44885
                     ],
                     [
-                        1.7528509,
-                        52.4465637
+                        5.977725,
+                        49.45955
                     ],
                     [
-                        1.8254914,
-                        52.4476705
+                        5.972317,
+                        49.46087
                     ],
                     [
-                        1.8345714,
-                        52.624408
+                        5.968912,
+                        49.48202
                     ],
                     [
-                        1.7690346,
-                        52.6291402
+                        5.9616,
+                        49.49026
                     ],
                     [
-                        1.7741711,
-                        52.717904
+                        5.915781,
+                        49.49835
                     ],
                     [
-                        1.6996925,
-                        52.721793
+                        5.890334,
+                        49.4948
                     ],
                     [
-                        1.706113,
-                        52.8103687
+                        5.863321,
+                        49.50006
                     ],
                     [
-                        1.559724,
-                        52.8165777
+                        5.84897,
+                        49.50826
                     ],
                     [
-                        1.5648605,
-                        52.9034116
+                        5.84828,
+                        49.51397
                     ],
                     [
-                        1.4184715,
-                        52.9103818
+                        5.83641,
+                        49.51817
                     ],
                     [
-                        1.4223238,
-                        52.9281894
+                        5.831868,
+                        49.52639
                     ],
                     [
-                        1.3439928,
-                        52.9289635
+                        5.84308,
+                        49.53081
                     ],
                     [
-                        1.3491293,
-                        53.0001194
+                        5.835622,
+                        49.54114
                     ],
                     [
-                        0.4515789,
-                        53.022589
+                        5.816251,
+                        49.53325
                     ],
                     [
-                        0.4497629,
-                        52.9351139
+                        5.805201,
+                        49.54272
                     ],
                     [
-                        0.3789384,
-                        52.9351139
+                        5.859432,
+                        49.57158
                     ],
                     [
-                        0.3716744,
-                        52.846365
+                        5.868663,
+                        49.587
                     ],
                     [
-                        0.2227614,
-                        52.8496552
+                        5.862888,
+                        49.58525
                     ],
                     [
-                        0.2336575,
-                        52.9329248
+                        5.851102,
+                        49.58379
                     ],
                     [
-                        0.3062979,
-                        52.9351139
+                        5.847116,
+                        49.58961
                     ],
                     [
-                        0.308114,
-                        53.022589
+                        5.845652,
+                        49.5981
                     ],
                     [
-                        0.3807544,
-                        53.0236813
+                        5.869401,
+                        49.6106
                     ],
                     [
-                        0.3993708,
-                        53.2933729
+                        5.881819,
+                        49.63815
                     ],
                     [
-                        0.3248922,
-                        53.2987454
+                        5.899978,
+                        49.63907
                     ],
                     [
-                        0.3274604,
-                        53.3853782
+                        5.899339,
+                        49.66239
                     ],
                     [
-                        0.2504136,
-                        53.38691
+                        5.856561,
+                        49.67628
                     ],
                     [
-                        0.2581183,
-                        53.4748924
+                        5.856283,
+                        49.68211
                     ],
                     [
-                        0.1862079,
-                        53.4779494
+                        5.875703,
+                        49.71118
                     ],
                     [
-                        0.1913443,
-                        53.6548777
+                        5.864811,
+                        49.72331
                     ],
                     [
-                        0.1502527,
-                        53.6594436
+                        5.843249,
+                        49.71822
                     ],
                     [
-                        0.1528209,
-                        53.7666003
+                        5.82191,
+                        49.72128
                     ],
                     [
-                        0.0012954,
-                        53.7734308
+                        5.824894,
+                        49.73767
                     ],
                     [
-                        0.0025796,
-                        53.8424326
+                        5.820728,
+                        49.74878
                     ],
                     [
-                        -0.0282392,
-                        53.841675
+                        5.786264,
+                        49.79079
                     ],
                     [
-                        -0.0226575,
-                        53.9311501
+                        5.765172,
+                        49.78961
                     ],
                     [
-                        -0.1406983,
-                        53.9322193
+                        5.750937,
+                        49.79094
                     ],
                     [
-                        -0.1416063,
-                        54.0219323
+                        5.741591,
+                        49.82126
                     ],
                     [
-                        -0.1706625,
-                        54.0235326
+                        5.745814,
+                        49.82435
                     ],
                     [
-                        -0.1679384,
-                        54.0949482
+                        5.737197,
+                        49.83353
                     ],
                     [
-                        -0.0126694,
-                        54.0912206
+                        5.740531,
+                        49.84142
                     ],
                     [
-                        -0.0099454,
-                        54.1811226
+                        5.747012,
+                        49.84048
                     ],
                     [
-                        -0.1615824,
-                        54.1837795
+                        5.746237,
+                        49.84783
                     ],
                     [
-                        -0.1606744,
-                        54.2029038
+                        5.753989,
+                        49.84878
                     ],
                     [
-                        -0.2405789,
-                        54.2034349
+                        5.740663,
+                        49.85152
                     ],
                     [
-                        -0.2378549,
-                        54.2936234
+                        5.752288,
+                        49.85922
                     ],
                     [
-                        -0.3894919,
-                        54.2941533
+                        5.749545,
+                        49.87554
                     ],
                     [
-                        -0.3857497,
-                        54.3837321
+                        5.775668,
+                        49.87438
                     ],
                     [
-                        -0.461638,
-                        54.3856364
+                        5.775053,
+                        49.88057
                     ],
                     [
-                        -0.4571122,
-                        54.4939066
+                        5.734598,
+                        49.89341
                     ],
                     [
-                        -0.6105651,
-                        54.4965434
+                        5.733033,
+                        49.90285
                     ],
                     [
-                        -0.6096571,
-                        54.5676704
+                        5.757834,
+                        49.91737
                     ],
                     [
-                        -0.7667421,
-                        54.569776
+                        5.760393,
+                        49.93252
                     ],
                     [
-                        -0.7640181,
-                        54.5887213
+                        5.770728,
+                        49.93711
                     ],
                     [
-                        -0.9192871,
-                        54.5908258
+                        5.768783,
+                        49.94239
                     ],
                     [
-                        -0.9148116,
-                        54.6608348
+                        5.768802,
+                        49.96104
                     ],
                     [
-                        -1.1485204,
-                        54.6634343
+                        5.786724,
+                        49.96816
                     ],
                     [
-                        -1.1472363,
-                        54.7528316
+                        5.80524,
+                        49.96677
                     ],
                     [
-                        -1.2268514,
-                        54.7532021
+                        5.806521,
+                        49.97321
                     ],
                     [
-                        -1.2265398,
-                        54.8429879
+                        5.831293,
+                        49.97995
                     ],
                     [
-                        -1.2991803,
-                        54.8435107
+                        5.834616,
+                        49.98656
                     ],
                     [
-                        -1.2991803,
-                        54.9333391
+                        5.818057,
+                        49.99936
                     ],
                     [
-                        -1.3454886,
-                        54.9354258
+                        5.815606,
+                        50.01437
                     ],
                     [
-                        -1.3436726,
-                        55.0234878
+                        5.847923,
+                        50.02809
                     ],
                     [
-                        -1.3772688,
-                        55.0255698
+                        5.861889,
+                        50.04581
                     ],
                     [
-                        -1.3754528,
-                        55.1310877
+                        5.850872,
+                        50.0563
                     ],
                     [
-                        -1.4997441,
-                        55.1315727
+                        5.857809,
+                        50.07186
                     ],
                     [
-                        -1.4969272,
-                        55.2928323
+                        5.880997,
+                        50.08069
                     ],
                     [
-                        -1.5296721,
-                        55.2942946
+                        5.891965,
+                        50.12041
                     ],
                     [
-                        -1.5258198,
-                        55.6523803
+                        5.952856,
+                        50.13384
                     ],
                     [
-                        -1.7659492,
-                        55.6545537
-                    ],
+                        5.961753,
+                        50.17631
+                    ]
+                ]
+            ],
+            "terms_url": "http://www.act.public.lu/fr/actualites/2014/02/ortho2014/",
+            "terms_text": "Administration du Cadastre et de la Topographie",
+            "id": "lu.geoportail.inspire.ortho2013"
+        },
+        {
+            "name": "MapQuest Open Aerial",
+            "type": "tms",
+            "template": "http://oatile{switch:1,2,3,4}.mqcdn.com/tiles/1.0.0/sat/{zoom}/{x}/{y}.png",
+            "default": true
+        },
+        {
+            "name": "Mapbox Satellite",
+            "type": "tms",
+            "description": "Satellite and aerial imagery.",
+            "template": "http://{switch:a,b,c}.tiles.mapbox.com/v4/openstreetmap.map-inh7ifmo/{zoom}/{x}/{y}.png?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJhNVlHd29ZIn0.ti6wATGDWOmCnCYen-Ip7Q",
+            "scaleExtent": [
+                0,
+                19
+            ],
+            "terms_url": "http://www.mapbox.com/about/maps/",
+            "terms_text": "Terms & Feedback",
+            "id": "Mapbox",
+            "default": true
+        },
+        {
+            "name": "NLS - Bartholomew Half Inch, 1897-1907",
+            "type": "tms",
+            "template": "http://geo.nls.uk/mapdata2/bartholomew/great_britain/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                0,
+                15
+            ],
+            "polygon": [
+                [
                     [
-                        -1.7620968,
-                        55.7435626
+                        -9,
+                        49.8
                     ],
                     [
-                        -1.9688392,
-                        55.7435626
+                        -9,
+                        61.1
                     ],
                     [
-                        -1.9698023,
-                        55.8334505
+                        1.9,
+                        61.1
                     ],
                     [
-                        -2.0019051,
-                        55.8336308
+                        1.9,
+                        49.8
                     ],
                     [
-                        -2.0015841,
-                        55.9235526
-                    ],
+                        -9,
+                        49.8
+                    ]
+                ]
+            ],
+            "terms_url": "http://geo.nls.uk/maps/",
+            "terms_text": "National Library of Scotland Historic Maps"
+        },
+        {
+            "name": "NLS - OS 1-inch 7th Series 1955-61",
+            "type": "tms",
+            "template": "http://geo.nls.uk/mapdata2/os/seventh/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                5,
+                16
+            ],
+            "polygon": [
+                [
                     [
-                        -2.1604851,
-                        55.9240613
+                        -6.4585407,
+                        49.9044128
                     ],
                     [
-                        -2.1613931,
-                        55.9413549
+                        -6.3872009,
+                        49.9841116
                     ],
                     [
-                        -2.3202942,
-                        55.9408463
+                        -6.2296827,
+                        49.9896159
                     ],
                     [
-                        -2.3212022,
-                        56.0145126
+                        -6.2171269,
+                        49.8680087
                     ],
                     [
-                        -2.5627317,
-                        56.0124824
-                    ],
+                        -6.4551164,
+                        49.8591793
+                    ]
+                ],
+                [
                     [
-                        -2.5645477,
-                        56.1022207
+                        -1.4495137,
+                        60.8634056
                     ],
                     [
-                        -2.9658863,
-                        56.0991822
+                        -0.7167114,
+                        60.8545122
                     ],
                     [
-                        -2.9667943,
-                        56.1710304
+                        -0.7349744,
+                        60.4359756
                     ],
                     [
-                        -2.4828272,
-                        56.1755797
+                        -0.6938826,
+                        60.4168218
                     ],
                     [
-                        -2.4882752,
-                        56.2856078
+                        -0.7258429,
+                        60.3942735
                     ],
                     [
-                        -2.5645477,
-                        56.2835918
+                        -0.7395401,
+                        60.0484714
                     ],
                     [
-                        -2.5681798,
-                        56.3742075
+                        -0.9267357,
+                        60.0461918
                     ],
                     [
-                        -2.7261728,
-                        56.3732019
+                        -0.9381501,
+                        59.8266157
                     ],
                     [
-                        -2.7316208,
-                        56.4425301
+                        -1.4586452,
+                        59.831205
                     ],
                     [
-                        -2.6190281,
-                        56.4425301
+                        -1.4455187,
+                        60.0535999
                     ],
                     [
-                        -2.6153961,
-                        56.5317671
+                        -1.463211,
+                        60.0535999
                     ],
                     [
-                        -2.453771,
-                        56.5347715
+                        -1.4643524,
+                        60.0630002
                     ],
                     [
-                        -2.4534686,
-                        56.6420248
+                        -1.5716475,
+                        60.0638546
                     ],
                     [
-                        -2.4062523,
-                        56.6440218
+                        -1.5693646,
+                        60.1790005
                     ],
                     [
-                        -2.3953562,
-                        56.7297964
+                        -1.643558,
+                        60.1807033
                     ],
                     [
-                        -2.2936596,
-                        56.7337811
+                        -1.643558,
+                        60.1892162
                     ],
                     [
-                        -2.2972916,
-                        56.807423
+                        -1.8216221,
+                        60.1894999
                     ],
                     [
-                        -2.1629067,
-                        56.8113995
+                        -1.8204807,
+                        60.3615507
                     ],
                     [
-                        -2.1592747,
-                        56.9958425
+                        -1.8415973,
+                        60.3697345
                     ],
                     [
-                        -1.9922016,
-                        57.0017771
+                        -1.8216221,
+                        60.3832755
                     ],
                     [
-                        -2.0067297,
-                        57.2737477
+                        -1.8179852,
+                        60.5934321
                     ],
                     [
-                        -1.9195612,
-                        57.2757112
-                    ],
+                        -1.453168,
+                        60.5934321
+                    ]
+                ],
+                [
                     [
-                        -1.9304572,
-                        57.3482876
+                        -4.9089213,
+                        54.4242078
                     ],
                     [
-                        -1.8106005,
-                        57.3443682
+                        -4.282598,
+                        54.4429861
                     ],
                     [
-                        -1.7997044,
-                        57.4402728
+                        -4.2535417,
+                        54.029769
                     ],
                     [
-                        -1.6616875,
-                        57.4285429
-                    ],
+                        -4.8766366,
+                        54.0221831
+                    ]
+                ],
+                [
                     [
-                        -1.6689516,
-                        57.5398256
+                        -5.8667408,
+                        59.1444603
                     ],
                     [
-                        -1.7452241,
-                        57.5398256
+                        -5.7759966,
+                        59.1470945
                     ],
                     [
-                        -1.7524881,
-                        57.6313302
+                        -5.7720016,
+                        59.1014052
                     ],
                     [
-                        -1.8287606,
-                        57.6332746
-                    ],
+                        -5.8621751,
+                        59.0990605
+                    ]
+                ],
+                [
                     [
-                        -1.8287606,
-                        57.7187255
+                        -1.7065887,
+                        59.5703599
                     ],
                     [
-                        -3.1768526,
-                        57.7171219
+                        -1.5579165,
+                        59.5693481
                     ],
                     [
-                        -3.1794208,
-                        57.734264
+                        -1.5564897,
+                        59.4965695
                     ],
                     [
-                        -3.5134082,
-                        57.7292105
-                    ],
+                        -1.7054472,
+                        59.4975834
+                    ]
+                ],
+                [
                     [
-                        -3.5129542,
-                        57.7112683
+                        -7.6865827,
+                        58.2940975
                     ],
                     [
-                        -3.7635638,
-                        57.7076303
+                        -7.5330594,
+                        58.3006957
                     ],
                     [
-                        -3.7598539,
-                        57.635713
+                        -7.5256401,
+                        58.2646905
                     ],
                     [
-                        -3.8420372,
-                        57.6343382
-                    ],
+                        -7.6797341,
+                        58.2577853
+                    ]
+                ],
+                [
                     [
-                        -3.8458895,
-                        57.6178365
+                        -4.5338281,
+                        59.0359871
                     ],
                     [
-                        -3.9794374,
-                        57.6157733
+                        -4.481322,
+                        59.0371616
                     ],
                     [
-                        -3.9794374,
-                        57.686544
+                        -4.4796099,
+                        59.0186583
                     ],
                     [
-                        -3.8150708,
-                        57.689976
-                    ],
+                        -4.5332574,
+                        59.0180707
+                    ]
+                ],
+                [
                     [
-                        -3.817639,
-                        57.7968899
+                        -8.6710698,
+                        57.8769896
                     ],
                     [
-                        -3.6853753,
-                        57.7989429
+                        -8.4673234,
+                        57.8897332
                     ],
                     [
-                        -3.6892276,
-                        57.8891567
+                        -8.4467775,
+                        57.7907
                     ],
                     [
-                        -3.9383458,
-                        57.8877915
-                    ],
+                        -8.6510947,
+                        57.7779213
+                    ]
+                ],
+                [
                     [
-                        -3.9421981,
-                        57.9750592
+                        -5.2395519,
+                        50.3530581
                     ],
                     [
-                        -3.6943641,
-                        57.9784638
+                        -5.7920073,
+                        50.3384899
                     ],
                     [
-                        -3.6969323,
-                        58.0695865
+                        -5.760047,
+                        49.9317027
                     ],
                     [
-                        -4.0372226,
-                        58.0641528
+                        -4.6551363,
+                        49.9581461
                     ],
                     [
-                        -4.0346543,
-                        57.9730163
+                        -4.677965,
+                        50.2860073
                     ],
                     [
-                        -4.2003051,
-                        57.9702923
+                        -4.244219,
+                        50.2801723
                     ],
                     [
-                        -4.1832772,
-                        57.7012869
+                        -4.2487848,
+                        50.2042525
                     ],
                     [
-                        -4.518752,
-                        57.6951111
+                        -3.3812929,
+                        50.2042525
                     ],
                     [
-                        -4.5122925,
-                        57.6050682
+                        -3.4223846,
+                        50.5188201
                     ],
                     [
-                        -4.6789116,
-                        57.6016628
+                        -3.1164796,
+                        50.5246258
                     ],
                     [
-                        -4.666022,
-                        57.4218334
+                        -3.1210453,
+                        50.6579592
                     ],
                     [
-                        -3.6677696,
-                        57.4394729
+                        -2.6736357,
+                        50.6619495
                     ],
                     [
-                        -3.671282,
-                        57.5295384
+                        -2.5953453,
+                        50.6394325
                     ],
                     [
-                        -3.3384979,
-                        57.5331943
+                        -2.5905026,
+                        50.5728419
                     ],
                     [
-                        -3.3330498,
-                        57.4438859
+                        -2.4791203,
+                        50.5733545
                     ],
                     [
-                        -2.8336466,
-                        57.4485275
+                        -2.4758919,
+                        50.5066704
                     ],
                     [
-                        -2.8236396,
-                        56.9992706
+                        -2.3967943,
+                        50.5056438
                     ],
                     [
-                        -2.3305398,
-                        57.0006693
+                        -2.401637,
+                        50.5723293
                     ],
                     [
-                        -2.3298977,
-                        56.9113932
+                        -1.0400296,
+                        50.5718167
                     ],
                     [
-                        -2.6579889,
-                        56.9092901
+                        -1.0335726,
+                        50.7059289
                     ],
                     [
-                        -2.6559637,
-                        56.8198406
+                        -0.549302,
+                        50.7038843
                     ],
                     [
-                        -2.8216747,
-                        56.8188467
+                        -0.5460736,
+                        50.7886618
                     ],
                     [
-                        -2.8184967,
-                        56.7295397
+                        -0.0924734,
+                        50.7856002
                     ],
                     [
-                        -3.1449248,
-                        56.7265508
+                        -0.0876307,
+                        50.7181949
                     ],
                     [
-                        -3.1435628,
-                        56.6362749
+                        0.4789659,
+                        50.7120623
                     ],
                     [
-                        -3.4679089,
-                        56.6350265
+                        0.487037,
+                        50.8182467
                     ],
                     [
-                        -3.474265,
-                        56.7238108
+                        0.9761503,
+                        50.8049868
                     ],
                     [
-                        -3.8011471,
-                        56.7188284
+                        0.9922927,
+                        51.0126311
                     ],
                     [
-                        -3.785711,
-                        56.4493026
+                        1.4491213,
+                        51.0004424
                     ],
                     [
-                        -3.946428,
-                        56.4457896
+                        1.4781775,
+                        51.4090372
                     ],
                     [
-                        -3.9428873,
-                        56.2659777
+                        1.0229632,
+                        51.4271576
                     ],
                     [
-                        -4.423146,
-                        56.2588459
+                        1.035877,
+                        51.7640881
                     ],
                     [
-                        -4.4141572,
-                        56.0815506
+                        1.6105448,
+                        51.7500992
                     ],
                     [
-                        -4.8944159,
-                        56.0708008
+                        1.646058,
+                        52.1560003
                     ],
                     [
-                        -4.8791072,
-                        55.8896994
+                        1.7267698,
+                        52.1540195
                     ],
                     [
-                        -5.1994158,
-                        55.8821374
+                        1.749369,
+                        52.4481811
                     ],
                     [
-                        -5.1852906,
-                        55.7023791
+                        1.7870672,
+                        52.4811624
                     ],
                     [
-                        -5.0273445,
-                        55.7067203
+                        1.759102,
+                        52.522505
                     ],
                     [
-                        -5.0222081,
-                        55.6879046
+                        1.7933451,
+                        52.9602749
                     ],
                     [
-                        -4.897649,
-                        55.6907999
+                        0.3798147,
+                        52.9958468
                     ],
                     [
-                        -4.8880181,
-                        55.6002822
+                        0.3895238,
+                        53.2511239
                     ],
                     [
-                        -4.7339244,
-                        55.6046348
+                        0.3478614,
+                        53.2511239
                     ],
                     [
-                        -4.7275038,
-                        55.5342082
+                        0.3238912,
+                        53.282186
                     ],
                     [
-                        -4.773732,
-                        55.5334815
+                        0.3461492,
+                        53.6538501
                     ],
                     [
-                        -4.7685955,
-                        55.4447227
+                        0.128487,
+                        53.6575466
                     ],
                     [
-                        -4.8494947,
-                        55.4418092
+                        0.116582,
+                        53.6674703
                     ],
                     [
-                        -4.8405059,
-                        55.3506535
+                        0.1350586,
+                        54.0655731
                     ],
                     [
-                        -4.8700405,
-                        55.3513836
+                        -0.0609831,
+                        54.065908
                     ],
                     [
-                        -4.8649041,
-                        55.2629462
+                        -0.0414249,
+                        54.4709448
                     ],
                     [
-                        -4.9920314,
-                        55.2592875
+                        -0.5662701,
+                        54.4771794
                     ],
                     [
-                        -4.9907473,
-                        55.1691779
+                        -0.5592078,
+                        54.6565127
                     ],
                     [
-                        -5.0600894,
-                        55.1655105
+                        -1.1665638,
+                        54.6623485
                     ],
                     [
-                        -5.0575212,
-                        55.0751884
+                        -1.1637389,
+                        54.842611
                     ],
                     [
-                        -5.2141831,
-                        55.0722477
+                        -1.3316194,
+                        54.843909
                     ],
                     [
-                        -5.1991766,
-                        54.8020337
+                        -1.3257065,
+                        55.2470842
                     ],
                     [
-                        -5.0466316,
-                        54.8062205
+                        -1.529453,
+                        55.2487108
                     ],
                     [
-                        -5.0502636,
-                        54.7244996
+                        -1.524178,
+                        55.6540122
                     ],
                     [
-                        -4.9703591,
-                        54.7203043
+                        -1.7638798,
+                        55.6540122
                     ],
                     [
-                        -4.9776232,
-                        54.6215905
+                        -1.7733693,
+                        55.9719116
                     ],
                     [
-                        -4.796022,
-                        54.6342056
+                        -2.1607858,
+                        55.9682981
                     ],
                     [
-                        -4.796022,
-                        54.7307917
+                        -2.1543289,
+                        56.0621387
                     ],
                     [
-                        -4.8977186,
-                        54.7265971
+                        -2.4578051,
+                        56.0585337
                     ],
                     [
-                        -4.9086147,
-                        54.8145928
+                        -2.4190635,
+                        56.641717
                     ],
                     [
-                        -4.8069181,
-                        54.8166856
+                        -2.0962164,
+                        56.641717
                     ],
                     [
-                        -4.8105501,
-                        54.7915648
+                        -2.0833025,
+                        57.0021322
                     ],
                     [
-                        -4.6943253,
-                        54.7978465
+                        -1.9283359,
+                        57.0126802
                     ],
                     [
-                        -4.6761652,
-                        54.7244996
+                        -1.9180966,
+                        57.3590895
                     ],
                     [
-                        -4.5744686,
-                        54.7244996
+                        -1.7502161,
+                        57.3625721
                     ],
                     [
-                        -4.5599405,
-                        54.6426135
+                        -1.7695869,
+                        57.7608634
                     ],
                     [
-                        -4.3093309,
-                        54.6384098
+                        -3.6937554,
+                        57.7574187
                     ],
                     [
-                        -4.3333262,
-                        54.8229889
+                        -3.7066693,
+                        57.9806386
                     ],
                     [
-                        -4.2626999,
-                        54.8274274
+                        -3.5969013,
+                        57.9772149
                     ],
                     [
-                        -4.2549952,
-                        54.7348587
+                        -3.6033582,
+                        58.1207277
                     ],
                     [
-                        -3.8338058,
-                        54.7400481
+                        -3.0222335,
+                        58.1309566
                     ],
                     [
-                        -3.836374,
-                        54.8141105
+                        -3.0286905,
+                        58.5410788
                     ],
                     [
-                        -3.7118149,
-                        54.8133706
+                        -2.8478961,
+                        58.530968
                     ],
                     [
-                        -3.7143831,
-                        54.8318654
+                        -2.86081,
+                        58.8430508
                     ],
                     [
-                        -3.5346072,
-                        54.8355633
+                        -2.679624,
+                        58.8414991
                     ],
                     [
-                        -3.5271039,
-                        54.9066228
+                        -2.6841897,
+                        58.885175
                     ],
                     [
-                        -3.4808758,
-                        54.9084684
+                        -2.6339665,
+                        58.9052239
                     ],
                     [
-                        -3.4776655,
-                        54.7457328
+                        -2.679624,
+                        58.9335083
                     ],
                     [
-                        -3.5874573,
-                        54.744621
+                        -2.6887555,
+                        59.0229231
                     ],
                     [
-                        -3.5836049,
-                        54.6546166
+                        -2.3668703,
+                        59.0229231
                     ],
                     [
-                        -3.7107322,
-                        54.6531308
+                        -2.3702946,
+                        59.2652861
                     ],
                     [
-                        -3.6991752,
-                        54.4550407
+                        -2.3429001,
+                        59.2821989
                     ],
                     [
-                        -3.5746161,
-                        54.4572801
+                        -2.3714361,
+                        59.2996861
                     ],
                     [
-                        -3.5759002,
-                        54.3863042
+                        -2.3737189,
+                        59.3707083
                     ],
                     [
-                        -3.539945,
-                        54.3855564
+                        -2.3429001,
+                        59.385825
                     ],
                     [
-                        -3.5386609,
-                        54.297224
+                        -2.3725775,
+                        59.400354
                     ],
                     [
-                        -3.46033,
-                        54.2957252
+                        -2.3714361,
+                        59.4259098
                     ],
                     [
-                        -3.4590458,
-                        54.2079507
+                        -3.0734196,
+                        59.4230067
                     ],
                     [
-                        -3.3807149,
-                        54.2102037
+                        -3.0711368,
+                        59.3433649
                     ],
                     [
-                        -3.381999,
-                        54.1169788
+                        -3.103097,
+                        59.3311405
                     ],
                     [
-                        -3.302878,
-                        54.1160656
+                        -3.0745611,
+                        59.3136695
                     ],
                     [
-                        -3.300154,
-                        54.0276224
+                        -3.0722782,
+                        59.232603
                     ],
                     [
-                        -3.1013007,
-                        54.0292224
+                        -3.3850319,
+                        59.1484167
                     ],
                     [
-                        -3.093596,
-                        53.6062158
+                        -3.3747589,
+                        58.9352753
                     ],
                     [
-                        -3.2065981,
-                        53.6016441
+                        -3.5653789,
+                        58.9323303
                     ],
                     [
-                        -3.2091663,
-                        53.4917753
+                        -3.554829,
+                        58.69759
                     ],
                     [
-                        -3.2451215,
-                        53.4887193
+                        -5.2808579,
+                        58.6667732
                     ],
                     [
-                        -3.2348486,
-                        53.4045934
+                        -5.2534159,
+                        58.3514125
                     ],
                     [
-                        -3.5276266,
-                        53.3999999
+                        -5.5068508,
+                        58.3437887
                     ],
                     [
-                        -3.5343966,
-                        53.328481
+                        -5.4761804,
+                        58.0323557
                     ],
                     [
-                        -3.6488053,
-                        53.3252272
+                        -5.8974958,
+                        58.0212436
                     ],
                     [
-                        -3.6527308,
-                        53.3057716
+                        -5.8522972,
+                        57.6171758
                     ],
                     [
-                        -3.7271873,
-                        53.3046865
+                        -6.1396311,
+                        57.6137174
                     ],
                     [
-                        -3.7315003,
-                        53.3945257
+                        -6.1541592,
+                        57.7423183
                     ],
                     [
-                        -3.9108315,
-                        53.3912769
+                        -6.2913692,
+                        57.7380102
                     ],
                     [
-                        -3.9071995,
-                        53.3023804
+                        -6.3365678,
+                        58.1398784
                     ],
                     [
-                        -3.9521457,
-                        53.3015665
+                        -6.1121891,
+                        58.1466944
                     ],
                     [
-                        -3.9566724,
-                        53.3912183
+                        -6.1473778,
+                        58.5106285
                     ],
                     [
-                        -4.1081979,
-                        53.3889209
+                        -6.2934817,
+                        58.5416182
                     ],
                     [
-                        -4.1081979,
-                        53.4072967
+                        -6.8413713,
+                        58.2977321
                     ],
                     [
-                        -4.2622916,
-                        53.4065312
+                        -7.0057382,
+                        58.2929331
                     ],
                     [
-                        -4.2635757,
-                        53.4753707
+                        -7.1016189,
+                        58.2064403
                     ],
                     [
-                        -4.638537,
-                        53.4677274
+                        -7.2573132,
+                        58.1793148
                     ],
                     [
-                        -4.6346847,
-                        53.3812621
+                        -7.2531092,
+                        58.1004928
                     ],
                     [
-                        -4.7091633,
-                        53.3774321
+                        -7.4070698,
+                        58.0905566
                     ],
                     [
-                        -4.7001745,
-                        53.1954965
+                        -7.391347,
+                        57.7911354
                     ],
                     [
-                        -4.5499332,
-                        53.1962658
+                        -7.790991,
+                        57.7733151
                     ],
                     [
-                        -4.5435126,
-                        53.1092488
+                        -7.7624215,
+                        57.5444165
                     ],
                     [
-                        -4.3919871,
-                        53.1100196
-                    ],
-                    [
-                        -4.3855666,
-                        53.0236002
-                    ],
-                    [
-                        -4.6115707,
-                        53.0205105
-                    ],
-                    [
-                        -4.603866,
-                        52.9284932
-                    ],
-                    [
-                        -4.7566756,
-                        52.9261709
-                    ],
-                    [
-                        -4.7476868,
-                        52.8370555
-                    ],
-                    [
-                        -4.8208813,
-                        52.8331768
-                    ],
-                    [
-                        -4.8208813,
-                        52.7446476
-                    ],
-                    [
-                        -4.3701572,
-                        52.7539749
-                    ],
-                    [
-                        -4.3765778,
-                        52.8401583
-                    ],
-                    [
-                        -4.2314728,
-                        52.8455875
-                    ],
-                    [
-                        -4.2237682,
-                        52.7586379
-                    ],
-                    [
-                        -4.1056297,
-                        52.7570836
-                    ],
-                    [
-                        -4.1015192,
-                        52.6714874
-                    ],
-                    [
-                        -4.1487355,
-                        52.6703862
-                    ],
-                    [
-                        -4.1305754,
-                        52.4008596
-                    ],
-                    [
-                        -4.1995838,
-                        52.3986435
-                    ],
-                    [
-                        -4.2050319,
-                        52.3110195
-                    ],
-                    [
-                        -4.3466808,
-                        52.303247
-                    ],
-                    [
-                        -4.3484968,
-                        52.2365693
+                        -7.698501,
+                        57.1453194
                     ],
                     [
-                        -4.4901457,
-                        52.2332328
+                        -7.7943817,
+                        57.1304547
                     ],
                     [
-                        -4.4883297,
-                        52.2098702
+                        -7.716764,
+                        56.7368628
                     ],
                     [
-                        -4.6572188,
-                        52.2098702
+                        -7.0122067,
+                        56.7654359
                     ],
                     [
-                        -4.6590348,
-                        52.1385939
+                        -6.979922,
+                        56.5453858
                     ],
                     [
-                        -4.7788916,
-                        52.13525
+                        -7.0638622,
+                        56.5453858
                     ],
                     [
-                        -4.7807076,
-                        52.1162967
+                        -7.0444914,
+                        56.3562587
                     ],
                     [
-                        -4.9259885,
-                        52.1140663
+                        -6.500676,
+                        56.3812917
                     ],
                     [
-                        -4.9187245,
-                        52.0392855
+                        -6.4491433,
+                        55.9793649
                     ],
                     [
-                        -5.2365265,
-                        52.0314653
+                        -6.563287,
+                        55.9691456
                     ],
                     [
-                        -5.2347105,
-                        51.9442339
+                        -6.5393742,
+                        55.7030135
                     ],
                     [
-                        -5.3473032,
-                        51.9408755
+                        -6.5595521,
+                        55.6907321
                     ],
                     [
-                        -5.3473032,
-                        51.9195995
+                        -6.5345315,
+                        55.6761713
                     ],
                     [
-                        -5.4925842,
-                        51.9162392
+                        -6.5216176,
+                        55.5704434
                     ],
                     [
-                        -5.4853201,
-                        51.8265386
+                        -5.8912587,
+                        55.5923416
                     ],
                     [
-                        -5.1983903,
-                        51.8321501
+                        -5.8560127,
+                        55.2320733
                     ],
                     [
-                        -5.1893102,
-                        51.7625177
+                        -5.2293639,
+                        55.2515958
                     ],
                     [
-                        -5.335825,
-                        51.7589528
+                        -5.1837064,
+                        54.6254139
                     ],
                     [
-                        -5.3281204,
-                        51.6686495
+                        -3.6655956,
+                        54.6518373
                     ],
                     [
-                        -5.1836575,
-                        51.6730296
+                        -3.6496155,
+                        54.4320023
                     ],
                     [
-                        -5.1836575,
-                        51.6539134
+                        -3.5400375,
+                        54.4306744
                     ],
                     [
-                        -5.0674452,
-                        51.6578966
+                        -3.530906,
+                        54.0290181
                     ],
                     [
-                        -5.0603825,
-                        51.5677905
+                        -3.0697656,
+                        54.030359
                     ],
                     [
-                        -4.5974594,
-                        51.5809588
+                        -3.0675737,
+                        53.8221388
                     ],
                     [
-                        -4.60388,
-                        51.6726314
+                        -3.0804876,
+                        53.7739911
                     ],
                     [
-                        -4.345773,
-                        51.6726314
+                        -3.0619239,
+                        53.7477488
                     ],
                     [
-                        -4.3355001,
-                        51.4962964
+                        -3.0611168,
+                        53.6737049
                     ],
                     [
-                        -3.9528341,
-                        51.5106841
+                        -3.2144691,
+                        53.6708361
                     ],
                     [
-                        -3.9425611,
-                        51.5905333
+                        -3.2057699,
+                        53.4226163
                     ],
                     [
-                        -3.8809237,
-                        51.5953198
+                        -3.2799632,
+                        53.355224
                     ],
                     [
-                        -3.8706508,
-                        51.5074872
+                        -3.2896655,
+                        53.3608441
                     ],
                     [
-                        -3.7679216,
-                        51.4978952
+                        -3.3327547,
+                        53.364931
                     ],
                     [
-                        -3.7550805,
-                        51.4242895
+                        -3.3761293,
+                        53.3540318
                     ],
                     [
-                        -3.5855774,
-                        51.41468
+                        -4.0888976,
+                        53.3433102
                     ],
                     [
-                        -3.5778727,
-                        51.3329177
+                        -4.0945474,
+                        53.4612036
                     ],
                     [
-                        -3.0796364,
-                        51.3329177
+                        -4.697412,
+                        53.4448624
                     ],
                     [
-                        -3.0770682,
-                        51.2494018
+                        -4.6882805,
+                        53.3318598
                     ],
                     [
-                        -3.7216935,
-                        51.2381477
+                        -4.7202407,
+                        53.2895771
                     ],
                     [
-                        -3.7216935,
-                        51.2558315
+                        -4.6837148,
+                        53.2486184
                     ],
                     [
-                        -3.8706508,
-                        51.2558315
+                        -4.6768661,
+                        53.1542644
                     ],
                     [
-                        -3.8680825,
-                        51.2365398
+                        -4.8480816,
+                        53.1446807
                     ],
                     [
-                        -4.2944084,
-                        51.2252825
+                        -4.8178336,
+                        52.7440299
                     ],
                     [
-                        -4.289272,
-                        51.0496352
+                        -4.2545751,
+                        52.7558939
                     ],
                     [
-                        -4.5692089,
-                        51.0431767
+                        -4.228876,
+                        52.254876
                     ],
                     [
-                        -4.5624122,
-                        50.9497388
+                        -4.2607571,
+                        52.2536408
                     ],
                     [
-                        -4.5905604,
-                        50.9520269
+                        -4.2724603,
+                        52.2432637
                     ],
                     [
-                        -4.5896524,
-                        50.8627065
+                        -4.8136263,
+                        52.230095
                     ],
                     [
-                        -4.6296046,
-                        50.8592677
+                        -4.8079191,
+                        52.1138892
                     ],
                     [
-                        -4.6226411,
-                        50.7691513
+                        -5.3889104,
+                        52.0991668
                     ],
                     [
-                        -4.6952816,
-                        50.7680028
+                        -5.3717888,
+                        51.9129667
                     ],
                     [
-                        -4.6934655,
-                        50.6967379
+                        -5.4208706,
+                        51.9101502
                     ],
                     [
-                        -4.8342064,
-                        50.6938621
+                        -5.414022,
+                        51.8453218
                     ],
                     [
-                        -4.8296664,
-                        50.6046231
+                        -5.3683645,
+                        51.8474373
                     ],
                     [
-                        -4.9676833,
-                        50.6000126
+                        -5.3466772,
+                        51.5595332
                     ],
                     [
-                        -4.9685913,
-                        50.5821427
+                        -4.773676,
+                        51.5758518
                     ],
                     [
-                        -5.1084242,
-                        50.5786832
+                        -4.7656859,
+                        51.4885146
                     ],
                     [
-                        -5.1029762,
-                        50.4892254
+                        -4.1915432,
+                        51.4970427
                     ],
                     [
-                        -5.1311244,
-                        50.48807
+                        -4.1869775,
+                        51.4344663
                     ],
                     [
-                        -5.1274923,
-                        50.4163798
+                        -3.6151177,
+                        51.4444274
                     ],
                     [
-                        -5.2664172,
-                        50.4117509
+                        -3.6105519,
+                        51.3746543
                     ],
                     [
-                        -5.2609692,
-                        50.3034214
+                        -3.1494115,
+                        51.3789292
                     ],
                     [
-                        -5.5124868,
-                        50.2976214
+                        -3.1494115,
+                        51.2919281
                     ],
                     [
-                        -5.5061308,
-                        50.2256428
+                        -4.3038735,
+                        51.2745907
                     ],
                     [
-                        -5.6468717,
-                        50.2209953
-                    ]
-                ],
-                [
-                    [
-                        -5.1336607,
-                        55.2630226
+                        -4.2861169,
+                        51.0508721
                     ],
                     [
-                        -5.1021999,
-                        55.2639372
+                        -4.8543277,
+                        51.0366633
                     ],
                     [
-                        -5.0999527,
-                        55.2458239
+                        -4.8372201,
+                        50.7212787
                     ],
                     [
-                        -5.1322161,
-                        55.2446343
+                        -5.2618345,
+                        50.7082694
                     ]
                 ],
                 [
                     [
-                        -5.6431878,
-                        55.5095745
+                        -2.1502671,
+                        60.171318
                     ],
                     [
-                        -5.4861028,
-                        55.5126594
+                        -2.0030218,
+                        60.1696146
                     ],
                     [
-                        -5.4715747,
-                        55.3348829
+                        -2.0013096,
+                        60.0997023
                     ],
                     [
-                        -5.6277517,
-                        55.3302345
+                        -2.148555,
+                        60.1011247
                     ]
                 ],
                 [
                     [
-                        -4.7213517,
-                        51.2180246
+                        -6.2086011,
+                        59.1163488
                     ],
                     [
-                        -4.5804201,
-                        51.2212417
+                        -6.1229934,
+                        59.1166418
                     ],
                     [
-                        -4.5746416,
-                        51.1306736
+                        -6.121852,
+                        59.0714985
                     ],
                     [
-                        -4.7174993,
-                        51.1280545
+                        -6.2097426,
+                        59.0714985
                     ]
                 ],
                 [
                     [
-                        -5.1608796,
-                        55.4153626
+                        -4.4159559,
+                        59.0889036
                     ],
                     [
-                        -5.0045387,
-                        55.4190069
+                        -4.4212022,
+                        59.0770848
                     ],
                     [
-                        -5.0184798,
-                        55.6153521
+                        -4.3971904,
+                        59.0779143
                     ],
                     [
-                        -5.1755648,
-                        55.6138137
+                        -4.3913388,
+                        59.0897328
                     ]
                 ]
             ],
@@ -44700,9 +46654,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "terms_text": "National Library of Scotland Historic Maps"
         },
         {
-            "name": "NLS - OS 6-inch Scotland 1842-82",
+            "name": "NLS - OS 1:25k 1st Series 1937-61",
             "type": "tms",
-            "template": "http://geo.nls.uk/maps/os/six_inch/{zoom}/{x}/{-y}.png",
+            "template": "http://geo.nls.uk/mapdata2/os/25000/{zoom}/{x}/{-y}.png",
             "scaleExtent": [
                 5,
                 16
@@ -44710,16659 +46664,18602 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "polygon": [
                 [
                     [
-                        -5.2112173,
-                        54.8018593
+                        -4.7157244,
+                        54.6796556
                     ],
                     [
-                        -5.0642752,
-                        54.8026508
+                        -4.6850662,
+                        54.6800268
                     ],
                     [
-                        -5.0560354,
-                        54.6305176
+                        -4.6835779,
+                        54.6623245
                     ],
                     [
-                        -4.3158316,
-                        54.6297227
-                    ],
+                        -4.7148782,
+                        54.6615818
+                    ]
+                ],
+                [
                     [
-                        -4.3117117,
-                        54.7448258
+                        -3.7085748,
+                        58.3371151
                     ],
                     [
-                        -3.8530325,
-                        54.7464112
+                        -3.5405937,
+                        58.3380684
                     ],
                     [
-                        -3.8530325,
-                        54.8034424
+                        -3.5315137,
+                        58.1608002
                     ],
                     [
-                        -3.5522818,
-                        54.8034424
+                        -3.3608086,
+                        58.1622372
                     ],
                     [
-                        -3.5522818,
-                        54.8374644
+                        -3.3653486,
+                        58.252173
                     ],
                     [
-                        -3.468511,
-                        54.8406277
+                        -3.1610473,
+                        58.2536063
                     ],
                     [
-                        -3.4657644,
-                        54.8983158
+                        -3.1610473,
+                        58.3261509
                     ],
                     [
-                        -3.3847403,
-                        54.8991055
+                        -3.0275704,
+                        58.3271045
                     ],
                     [
-                        -3.3888601,
-                        54.9559214
+                        -3.0366505,
+                        58.6139001
                     ],
                     [
-                        -3.0920786,
-                        54.9539468
+                        -3.0021463,
+                        58.614373
                     ],
                     [
-                        -3.0392359,
-                        54.9923274
+                        -3.0030543,
+                        58.7036341
                     ],
                     [
-                        -3.0212713,
-                        55.0493881
+                        -3.4180129,
+                        58.7003322
                     ],
                     [
-                        -2.9591232,
-                        55.0463283
+                        -3.4171049,
+                        58.6290293
                     ],
                     [
-                        -2.9202807,
-                        55.0666294
+                        -3.7240109,
+                        58.6266658
                     ],
                     [
-                        -2.7857081,
-                        55.068652
+                        -3.7231029,
+                        58.606806
                     ],
                     [
-                        -2.7852225,
-                        55.0914426
+                        -4.2361262,
+                        58.5992374
                     ],
                     [
-                        -2.7337562,
-                        55.0922761
+                        -4.2334022,
+                        58.5092347
                     ],
                     [
-                        -2.737616,
-                        55.151204
+                        -3.88836,
+                        58.5144516
                     ],
                     [
-                        -2.7648395,
-                        55.1510672
+                        -3.8829119,
+                        58.4261327
                     ],
                     [
-                        -2.7013114,
-                        55.1722505
+                        -3.7158389,
+                        58.4270836
+                    ]
+                ],
+                [
+                    [
+                        -6.46676,
+                        49.9943621
                     ],
                     [
-                        -2.6635459,
-                        55.2192808
+                        -6.1889102,
+                        50.004868
                     ],
                     [
-                        -2.6460364,
-                        55.2188891
+                        -6.1789222,
+                        49.8967815
                     ],
                     [
-                        -2.629042,
-                        55.2233933
+                        -6.3169391,
+                        49.8915171
                     ],
                     [
-                        -2.6317886,
-                        55.2287781
+                        -6.312399,
+                        49.8200979
                     ],
                     [
-                        -2.6235488,
-                        55.2446345
-                    ],
+                        -6.4504159,
+                        49.8159968
+                    ]
+                ],
+                [
                     [
-                        -2.6197723,
-                        55.2454663
+                        -5.6453263,
+                        50.2029809
                     ],
                     [
-                        -2.6099017,
-                        55.2454174
+                        -5.7801329,
+                        50.2014076
                     ],
                     [
-                        -2.6099876,
-                        55.2486466
+                        -5.7637888,
+                        50.0197267
                     ],
                     [
-                        -2.6408121,
-                        55.2590039
+                        -5.3479221,
+                        50.0290604
                     ],
                     [
-                        -2.6247896,
-                        55.2615631
+                        -5.3388421,
+                        49.9414854
                     ],
                     [
-                        -2.6045186,
-                        55.2823081
+                        -5.024672,
+                        49.9473287
                     ],
                     [
-                        -2.5693176,
-                        55.296132
+                        -5.0355681,
+                        50.0383923
                     ],
                     [
-                        -2.5479542,
-                        55.3121617
+                        -5.0010639,
+                        50.0453901
                     ],
                     [
-                        -2.5091116,
-                        55.3234891
+                        -4.9974319,
+                        50.1304478
                     ],
                     [
-                        -2.4780376,
-                        55.3494471
+                        -4.855783,
+                        50.13394
                     ],
                     [
-                        -2.4421083,
-                        55.3533118
+                        -4.861231,
+                        50.206057
                     ],
                     [
-                        -2.4052079,
-                        55.3439256
+                        -4.6546085,
+                        50.2140172
                     ],
                     [
-                        -2.3726772,
-                        55.3447539
+                        -4.6558926,
+                        50.3018616
                     ],
                     [
-                        -2.3221819,
-                        55.3687665
+                        -4.5184924,
+                        50.3026818
                     ],
                     [
-                        -2.3241241,
-                        55.3999337
+                        -4.51464,
+                        50.325642
                     ],
                     [
-                        -2.2576062,
-                        55.425015
+                        -4.2488284,
+                        50.3264618
                     ],
                     [
-                        -2.1985547,
-                        55.4273529
+                        -4.2488284,
+                        50.3100631
                     ],
                     [
-                        -2.1484296,
-                        55.4717466
+                        -4.10886,
+                        50.3141633
                     ],
                     [
-                        -2.1944348,
-                        55.484199
+                        -4.1062917,
+                        50.2411267
                     ],
                     [
-                        -2.2040479,
-                        55.529306
+                        -3.9648088,
+                        50.2432047
                     ],
                     [
-                        -2.2960584,
-                        55.6379722
+                        -3.9640778,
+                        50.2254158
                     ],
                     [
-                        -2.2177808,
-                        55.6379722
+                        -3.8522287,
+                        50.2273626
                     ],
                     [
-                        -2.1059266,
-                        55.7452498
+                        -3.8503757,
+                        50.1552563
                     ],
                     [
-                        -1.9716874,
-                        55.7462161
+                        -3.6921809,
+                        50.1572487
                     ],
                     [
-                        -1.9697453,
-                        55.9190951
+                        -3.5414602,
+                        50.1602198
                     ],
                     [
-                        -2.1201694,
-                        55.9207115
+                        -3.5465781,
+                        50.3226814
                     ],
                     [
-                        -2.1242893,
-                        55.9776133
+                        -3.4068012,
+                        50.3241013
                     ],
                     [
-                        -2.3440159,
-                        55.9783817
+                        -3.4165761,
+                        50.5892711
                     ],
                     [
-                        -2.3440159,
-                        56.0390349
+                        -3.2746691,
+                        50.5962721
                     ],
                     [
-                        -2.5046909,
-                        56.0413363
+                        -3.2749172,
+                        50.6106323
                     ],
                     [
-                        -2.500571,
-                        56.1003588
+                        -2.9971742,
+                        50.613972
                     ],
                     [
-                        -2.8823459,
-                        56.0957629
+                        -2.9896008,
+                        50.688537
                     ],
                     [
-                        -2.8823459,
-                        56.1722898
+                        -2.7120266,
+                        50.690565
                     ],
                     [
-                        -2.4126804,
-                        56.1692316
+                        -2.710908,
+                        50.6195964
                     ],
                     [
-                        -2.4181736,
-                        56.2334017
+                        -2.5695473,
+                        50.6157538
                     ],
                     [
-                        -2.5857151,
-                        56.2303484
+                        -2.5651019,
+                        50.5134083
                     ],
                     [
-                        -2.5719822,
-                        56.3416356
+                        -2.4014463,
+                        50.513379
                     ],
                     [
-                        -2.7257908,
-                        56.3462022
+                        -2.3940583,
+                        50.6160348
                     ],
                     [
-                        -2.7312839,
-                        56.4343808
+                        -2.2894123,
+                        50.6147436
                     ],
                     [
-                        -2.6928318,
-                        56.4343808
+                        -2.2876184,
+                        50.6008549
                     ],
                     [
-                        -2.6928318,
-                        56.4859769
+                        -2.1477855,
+                        50.6048506
                     ],
                     [
-                        -2.5307834,
-                        56.4935587
+                        -2.1451013,
+                        50.5325437
                     ],
                     [
-                        -2.5307834,
-                        56.570806
+                        -1.9335117,
+                        50.5347477
                     ],
                     [
-                        -2.5302878,
-                        56.6047947
+                        -1.9362139,
+                        50.6170445
                     ],
                     [
-                        -2.3732428,
-                        56.6044452
+                        -1.8573025,
+                        50.6228094
                     ],
                     [
-                        -2.3684363,
-                        56.7398824
+                        -1.8554865,
+                        50.709139
                     ],
                     [
-                        -2.3292975,
-                        56.7398824
+                        -1.6066929,
+                        50.709139
                     ],
                     [
-                        -2.3292975,
-                        56.7888065
+                        -1.6085089,
+                        50.6239615
                     ],
                     [
-                        -2.3145346,
-                        56.7891826
+                        -1.4450678,
+                        50.6228094
                     ],
                     [
-                        -2.3148779,
-                        56.7967036
+                        -1.4432518,
+                        50.5317039
                     ],
                     [
-                        -2.171369,
-                        56.7967036
+                        -1.1545059,
+                        50.5293951
                     ],
                     [
-                        -2.1703979,
-                        56.9710595
+                        -1.1472419,
+                        50.6170485
                     ],
                     [
-                        -2.0101725,
-                        56.9694716
+                        -1.011041,
+                        50.6205051
                     ],
                     [
-                        -2.0101725,
-                        57.0846832
+                        -1.011041,
+                        50.7056889
                     ],
                     [
-                        -2.0817687,
-                        57.085349
+                        -0.704135,
+                        50.7045388
                     ],
                     [
-                        -2.0488097,
-                        57.1259963
+                        -0.700503,
+                        50.7769401
                     ],
                     [
-                        -2.0409133,
-                        57.126369
+                        -0.5860943,
+                        50.7723465
                     ],
                     [
-                        -2.0383434,
-                        57.2411129
+                        -0.5879103,
+                        50.7907181
                     ],
                     [
-                        -1.878118,
-                        57.2421638
+                        -0.0149586,
+                        50.7798108
                     ],
                     [
-                        -1.8771469,
-                        57.2978175
+                        -0.0185906,
+                        50.7625836
                     ],
                     [
-                        -1.9868771,
-                        57.2983422
+                        0.0967261,
+                        50.7620093
                     ],
                     [
-                        -1.9082209,
-                        57.3560063
+                        0.0921861,
+                        50.6913106
                     ],
                     [
-                        -1.8752048,
-                        57.3560063
+                        0.3046595,
+                        50.6890096
                     ],
                     [
-                        -1.8761758,
-                        57.3769527
+                        0.3101075,
+                        50.7757917
                     ],
                     [
-                        -1.8120857,
-                        57.4120111
+                        0.5511831,
+                        50.7726336
                     ],
                     [
-                        -1.7120661,
-                        57.4120111
+                        0.5529991,
+                        50.8432096
                     ],
                     [
-                        -1.7034646,
-                        57.6441388
+                        0.695556,
+                        50.8403428
                     ],
                     [
-                        -1.8666032,
-                        57.6451781
+                        0.696464,
+                        50.8592608
                     ],
                     [
-                        -1.8646611,
-                        57.7033351
+                        0.9852099,
+                        50.8523824
                     ],
                     [
-                        -3.1204292,
-                        57.7064705
+                        0.9906579,
+                        50.9417226
                     ],
                     [
-                        -3.1218025,
-                        57.7504652
+                        1.0160821,
+                        50.9411504
                     ],
                     [
-                        -3.4445259,
-                        57.7526635
+                        1.0215301,
+                        51.0303204
                     ],
                     [
-                        -3.4472724,
-                        57.7138067
+                        1.2812198,
+                        51.0240383
                     ],
                     [
-                        -3.5145637,
-                        57.7094052
+                        1.2848518,
+                        51.0948044
                     ],
                     [
-                        -3.5118171,
-                        57.6939956
+                        1.4277848,
+                        51.0948044
                     ],
                     [
-                        -3.7645027,
-                        57.6917938
+                        1.4386809,
+                        51.2882859
                     ],
                     [
-                        -3.7672492,
-                        57.6344975
+                        1.4713691,
+                        51.2871502
                     ],
                     [
-                        -3.842378,
-                        57.6288312
+                        1.4804492,
+                        51.3994534
                     ],
                     [
-                        -3.8438346,
-                        57.5965825
+                        1.1590151,
+                        51.4073836
                     ],
                     [
-                        -3.9414265,
-                        57.5916386
+                        1.1590151,
+                        51.3869889
                     ],
                     [
-                        -3.9404554,
-                        57.6537782
+                        1.0191822,
+                        51.3903886
                     ],
                     [
-                        -3.8894746,
-                        57.6529989
+                        1.0228142,
+                        51.4798247
                     ],
                     [
-                        -3.8826772,
-                        57.7676408
+                        0.8793493,
+                        51.4843484
                     ],
                     [
-                        -3.7224517,
-                        57.766087
+                        0.8829813,
+                        51.5566675
                     ],
                     [
-                        -3.7195385,
-                        57.8819201
+                        1.0264462,
+                        51.5544092
                     ],
                     [
-                        -3.9146888,
-                        57.8853352
+                        1.0373423,
+                        51.7493319
                     ],
                     [
-                        -3.916062,
-                        57.9546243
+                        1.2607117,
+                        51.7482076
                     ],
                     [
-                        -3.745774,
-                        57.9538956
+                        1.2661598,
+                        51.8279642
                     ],
                     [
-                        -3.7471473,
-                        58.0688409
+                        1.3351682,
+                        51.8335756
                     ],
                     [
-                        -3.5837256,
-                        58.0695672
+                        1.3478803,
+                        51.9199021
                     ],
                     [
-                        -3.5837256,
-                        58.1116689
+                        1.4840812,
+                        51.9199021
                     ],
                     [
-                        -3.4560096,
-                        58.1138452
+                        1.4986093,
+                        52.0038271
                     ],
                     [
-                        -3.4544646,
-                        58.228503
+                        1.6438902,
+                        52.0027092
                     ],
                     [
-                        -3.4379851,
-                        58.2283222
+                        1.6656823,
+                        52.270221
                     ],
                     [
-                        -3.4243233,
-                        58.2427725
+                        1.7310588,
+                        52.270221
                     ],
                     [
-                        -3.412307,
-                        58.2438567
+                        1.7528509,
+                        52.4465637
                     ],
                     [
-                        -3.3735115,
-                        58.2695057
+                        1.8254914,
+                        52.4476705
                     ],
                     [
-                        -3.3063919,
-                        58.2862038
+                        1.8345714,
+                        52.624408
                     ],
                     [
-                        -3.1229154,
-                        58.2859395
+                        1.7690346,
+                        52.6291402
                     ],
                     [
-                        -3.123602,
-                        58.3443661
+                        1.7741711,
+                        52.717904
                     ],
                     [
-                        -2.9574338,
-                        58.3447264
+                        1.6996925,
+                        52.721793
                     ],
                     [
-                        -2.951254,
-                        58.6422011
+                        1.706113,
+                        52.8103687
                     ],
                     [
-                        -2.8812162,
-                        58.6429157
+                        1.559724,
+                        52.8165777
                     ],
                     [
-                        -2.8851004,
-                        58.8112825
+                        1.5648605,
+                        52.9034116
                     ],
                     [
-                        -2.7180775,
-                        58.8142997
+                        1.4184715,
+                        52.9103818
                     ],
                     [
-                        -2.7161354,
-                        58.8715749
+                        1.4223238,
+                        52.9281894
                     ],
                     [
-                        -2.556881,
-                        58.8775984
+                        1.3439928,
+                        52.9289635
                     ],
                     [
-                        -2.5544533,
-                        58.9923453
+                        1.3491293,
+                        53.0001194
                     ],
                     [
-                        -2.5567617,
-                        59.0483775
+                        0.4515789,
+                        53.022589
                     ],
                     [
-                        -2.391893,
-                        59.0485996
+                        0.4497629,
+                        52.9351139
                     ],
                     [
-                        -2.3918002,
-                        59.1106996
+                        0.3789384,
+                        52.9351139
                     ],
                     [
-                        -2.4733695,
-                        59.1106996
+                        0.3716744,
+                        52.846365
                     ],
                     [
-                        -2.5591563,
-                        59.1783028
+                        0.2227614,
+                        52.8496552
                     ],
                     [
-                        -2.5630406,
-                        59.2210646
+                        0.2336575,
+                        52.9329248
                     ],
                     [
-                        -2.3921334,
-                        59.224046
+                        0.3062979,
+                        52.9351139
                     ],
                     [
-                        -2.3911409,
-                        59.2740075
+                        0.308114,
+                        53.022589
                     ],
                     [
-                        -2.3639512,
-                        59.2745036
+                        0.3807544,
+                        53.0236813
                     ],
                     [
-                        -2.3658933,
-                        59.285417
+                        0.3993708,
+                        53.2933729
                     ],
                     [
-                        -2.3911409,
-                        59.284921
+                        0.3248922,
+                        53.2987454
                     ],
                     [
-                        -2.3911409,
-                        59.3379505
+                        0.3274604,
+                        53.3853782
                     ],
                     [
-                        -2.2221759,
-                        59.3381981
+                        0.2504136,
+                        53.38691
                     ],
                     [
-                        -2.2233897,
-                        59.395965
+                        0.2581183,
+                        53.4748924
                     ],
                     [
-                        -2.3758467,
-                        59.396583
+                        0.1862079,
+                        53.4779494
                     ],
                     [
-                        -2.3899271,
-                        59.4026383
+                        0.1913443,
+                        53.6548777
                     ],
                     [
-                        -2.4008516,
-                        59.3962122
+                        0.1502527,
+                        53.6594436
                     ],
                     [
-                        -2.5637882,
-                        59.3952604
+                        0.1528209,
+                        53.7666003
                     ],
                     [
-                        -2.5637882,
-                        59.3385811
+                        0.0012954,
+                        53.7734308
                     ],
                     [
-                        -2.7320164,
-                        59.3375306
+                        0.0025796,
+                        53.8424326
                     ],
                     [
-                        -2.7333896,
-                        59.3952604
+                        -0.0282392,
+                        53.841675
                     ],
                     [
-                        -3.0726511,
-                        59.3931174
+                        -0.0226575,
+                        53.9311501
                     ],
                     [
-                        -3.0703404,
-                        59.3354759
+                        -0.1406983,
+                        53.9322193
                     ],
                     [
-                        -3.0753186,
-                        59.3355634
+                        -0.1416063,
+                        54.0219323
                     ],
                     [
-                        -3.0749753,
-                        59.3292593
+                        -0.1706625,
+                        54.0235326
                     ],
                     [
-                        -3.0698254,
-                        59.3289091
+                        -0.1679384,
+                        54.0949482
                     ],
                     [
-                        -3.069801,
-                        59.2196159
+                        -0.0126694,
+                        54.0912206
                     ],
                     [
-                        -3.2363384,
-                        59.2166341
+                        -0.0099454,
+                        54.1811226
                     ],
                     [
-                        -3.2336751,
-                        59.1606496
+                        -0.1615824,
+                        54.1837795
                     ],
                     [
-                        -3.4032766,
-                        59.1588895
+                        -0.1606744,
+                        54.2029038
                     ],
                     [
-                        -3.394086,
-                        58.9279316
+                        -0.2405789,
+                        54.2034349
                     ],
                     [
-                        -3.5664497,
-                        58.9259268
+                        -0.2378549,
+                        54.2936234
                     ],
                     [
-                        -3.5611089,
-                        58.8679885
+                        -0.3894919,
+                        54.2941533
                     ],
                     [
-                        -3.392508,
-                        58.8699339
+                        -0.3857497,
+                        54.3837321
                     ],
                     [
-                        -3.3894734,
-                        58.8698711
+                        -0.461638,
+                        54.3856364
                     ],
                     [
-                        -3.3891093,
-                        58.8684905
+                        -0.4571122,
+                        54.4939066
                     ],
                     [
-                        -3.3912942,
-                        58.868616
+                        -0.6105651,
+                        54.4965434
                     ],
                     [
-                        -3.3884161,
-                        58.7543084
+                        -0.6096571,
+                        54.5676704
                     ],
                     [
-                        -3.2238208,
-                        58.7555677
+                        -0.7667421,
+                        54.569776
                     ],
                     [
-                        -3.2189655,
-                        58.691289
+                        -0.7640181,
+                        54.5887213
                     ],
                     [
-                        -3.4634113,
-                        58.6905753
+                        -0.9192871,
+                        54.5908258
                     ],
                     [
-                        -3.4551716,
-                        58.6341518
+                        -0.9148116,
+                        54.6608348
                     ],
                     [
-                        -3.787508,
-                        58.6341518
+                        -1.1485204,
+                        54.6634343
                     ],
                     [
-                        -3.7861347,
-                        58.5769211
+                        -1.1472363,
+                        54.7528316
                     ],
                     [
-                        -3.9028645,
-                        58.5733411
+                        -1.2268514,
+                        54.7532021
                     ],
                     [
-                        -3.9028645,
-                        58.6477304
+                        -1.2265398,
+                        54.8429879
                     ],
                     [
-                        -4.0690327,
-                        58.6491594
+                        -1.2991803,
+                        54.8435107
                     ],
                     [
-                        -4.0690327,
-                        58.5912376
+                        -1.2991803,
+                        54.9333391
                     ],
                     [
-                        -4.7364521,
-                        58.5933845
+                        -1.3454886,
+                        54.9354258
                     ],
                     [
-                        -4.7364521,
-                        58.6505884
+                        -1.3436726,
+                        55.0234878
                     ],
                     [
-                        -5.0715351,
-                        58.6520173
+                        -1.3772688,
+                        55.0255698
                     ],
                     [
-                        -5.0654779,
-                        58.5325854
+                        -1.3754528,
+                        55.1310877
                     ],
                     [
-                        -5.2332047,
-                        58.5316087
+                        -1.4997441,
+                        55.1315727
                     ],
                     [
-                        -5.2283494,
-                        58.4719947
+                        -1.4969272,
+                        55.2928323
                     ],
                     [
-                        -5.2424298,
-                        58.4719947
+                        -1.5296721,
+                        55.2942946
                     ],
                     [
-                        -5.2366034,
-                        58.4089731
+                        -1.5258198,
+                        55.6523803
                     ],
                     [
-                        -5.2283494,
-                        58.4094818
+                        -1.7659492,
+                        55.6545537
                     ],
                     [
-                        -5.2210664,
-                        58.3005859
+                        -1.7620968,
+                        55.7435626
                     ],
                     [
-                        -5.5657939,
-                        58.2959933
+                        -1.9688392,
+                        55.7435626
                     ],
                     [
-                        -5.5580254,
-                        58.2372573
+                        -1.9698023,
+                        55.8334505
                     ],
                     [
-                        -5.4146722,
-                        58.2401326
+                        -2.0019051,
+                        55.8336308
                     ],
                     [
-                        -5.4141866,
-                        58.2267768
+                        -2.0015841,
+                        55.9235526
                     ],
                     [
-                        -5.3885749,
-                        58.2272242
+                        -2.1604851,
+                        55.9240613
                     ],
                     [
-                        -5.382714,
-                        58.1198615
+                        -2.1613931,
+                        55.9413549
                     ],
                     [
-                        -5.51043,
-                        58.1191362
+                        -2.3202942,
+                        55.9408463
                     ],
                     [
-                        -5.5114011,
-                        58.006214
+                        -2.3212022,
+                        56.0145126
                     ],
                     [
-                        -5.6745397,
-                        58.0041559
+                        -2.5627317,
+                        56.0124824
                     ],
                     [
-                        -5.6716266,
-                        57.9449366
+                        -2.5645477,
+                        56.1022207
                     ],
                     [
-                        -5.6716266,
-                        57.8887166
+                        -2.9658863,
+                        56.0991822
                     ],
                     [
-                        -5.8347652,
-                        57.8856193
+                        -2.9667943,
+                        56.1710304
                     ],
                     [
-                        -5.8277052,
-                        57.5988958
+                        -2.4828272,
+                        56.1755797
                     ],
                     [
-                        -6.0384259,
-                        57.5986357
+                        -2.4882752,
+                        56.2856078
                     ],
                     [
-                        -6.0389115,
-                        57.6459559
+                        -2.5645477,
+                        56.2835918
                     ],
                     [
-                        -6.1981658,
-                        57.6456961
+                        -2.5681798,
+                        56.3742075
                     ],
                     [
-                        -6.2076123,
-                        57.7600132
+                        -2.7261728,
+                        56.3732019
                     ],
                     [
-                        -6.537067,
-                        57.7544033
+                        -2.7316208,
+                        56.4425301
                     ],
                     [
-                        -6.5312406,
-                        57.6402392
+                        -2.6190281,
+                        56.4425301
                     ],
                     [
-                        -6.7002056,
-                        57.6360809
+                        -2.6153961,
+                        56.5317671
                     ],
                     [
-                        -6.6807844,
-                        57.5236293
+                        -2.453771,
+                        56.5347715
                     ],
                     [
-                        -6.8516915,
-                        57.5152857
+                        -2.4534686,
+                        56.6420248
                     ],
                     [
-                        -6.8361545,
-                        57.3385811
+                        -2.4062523,
+                        56.6440218
                     ],
                     [
-                        -6.6730158,
-                        57.3438213
+                        -2.3953562,
+                        56.7297964
                     ],
                     [
-                        -6.674958,
-                        57.2850883
+                        -2.2936596,
+                        56.7337811
                     ],
                     [
-                        -6.5098772,
-                        57.2850883
+                        -2.2972916,
+                        56.807423
                     ],
                     [
-                        -6.4982244,
-                        57.1757637
+                        -2.1629067,
+                        56.8113995
                     ],
                     [
-                        -6.3506228,
-                        57.1820797
+                        -2.1592747,
+                        56.9958425
                     ],
                     [
-                        -6.3312015,
-                        57.1251969
+                        -1.9922016,
+                        57.0017771
                     ],
                     [
-                        -6.1797156,
-                        57.1230884
+                        -2.0067297,
+                        57.2737477
                     ],
                     [
-                        -6.1719471,
-                        57.0682265
+                        -1.9195612,
+                        57.2757112
                     ],
                     [
-                        -6.4593819,
-                        57.059779
+                        -1.9304572,
+                        57.3482876
                     ],
                     [
-                        -6.4564687,
-                        57.1093806
+                        -1.8106005,
+                        57.3443682
                     ],
                     [
-                        -6.6671895,
-                        57.1062165
+                        -1.7997044,
+                        57.4402728
                     ],
                     [
-                        -6.6730158,
-                        57.002708
+                        -1.6616875,
+                        57.4285429
                     ],
                     [
-                        -6.5021087,
-                        57.0048233
+                        -1.6689516,
+                        57.5398256
                     ],
                     [
-                        -6.4836097,
-                        56.8917522
+                        -1.7452241,
+                        57.5398256
                     ],
                     [
-                        -6.3266104,
-                        56.8894062
+                        -1.7524881,
+                        57.6313302
                     ],
                     [
-                        -6.3156645,
-                        56.7799312
+                        -1.8287606,
+                        57.6332746
                     ],
                     [
-                        -6.2146739,
-                        56.775675
+                        -1.8287606,
+                        57.7187255
                     ],
                     [
-                        -6.2146739,
-                        56.7234965
+                        -3.1768526,
+                        57.7171219
                     ],
                     [
-                        -6.6866107,
-                        56.7224309
+                        -3.1794208,
+                        57.734264
                     ],
                     [
-                        -6.6769001,
-                        56.6114413
+                        -3.5134082,
+                        57.7292105
                     ],
                     [
-                        -6.8419809,
-                        56.607166
+                        -3.5129542,
+                        57.7112683
                     ],
                     [
-                        -6.8400387,
-                        56.5483307
+                        -3.7635638,
+                        57.7076303
                     ],
                     [
-                        -7.1546633,
-                        56.5461895
+                        -3.7598539,
+                        57.635713
                     ],
                     [
-                        -7.1488369,
-                        56.4872592
+                        -3.8420372,
+                        57.6343382
                     ],
                     [
-                        -6.9915246,
-                        56.490476
+                        -3.8458895,
+                        57.6178365
                     ],
                     [
-                        -6.9876404,
-                        56.4325329
+                        -3.9794374,
+                        57.6157733
                     ],
                     [
-                        -6.6827265,
-                        56.4314591
+                        -3.9794374,
+                        57.686544
                     ],
                     [
-                        -6.6769001,
-                        56.5472601
+                        -3.8150708,
+                        57.689976
                     ],
                     [
-                        -6.5292985,
-                        56.5504717
+                        -3.817639,
+                        57.7968899
                     ],
                     [
-                        -6.5234721,
-                        56.4379018
+                        -3.6853753,
+                        57.7989429
                     ],
                     [
-                        -6.3661598,
-                        56.4368281
+                        -3.6892276,
+                        57.8891567
                     ],
                     [
-                        -6.3642177,
-                        56.3766524
+                        -3.9383458,
+                        57.8877915
                     ],
                     [
-                        -6.5273563,
-                        56.3712749
+                        -3.9421981,
+                        57.9750592
                     ],
                     [
-                        -6.5171745,
-                        56.2428427
+                        -3.6943641,
+                        57.9784638
                     ],
                     [
-                        -6.4869621,
-                        56.247421
+                        -3.6969323,
+                        58.0695865
                     ],
                     [
-                        -6.4869621,
-                        56.1893882
+                        -4.0372226,
+                        58.0641528
                     ],
                     [
-                        -6.3001945,
-                        56.1985572
+                        -4.0346543,
+                        57.9730163
                     ],
                     [
-                        -6.3029411,
-                        56.2581017
+                        -4.2003051,
+                        57.9702923
                     ],
                     [
-                        -5.9019401,
-                        56.256576
+                        -4.1832772,
+                        57.7012869
                     ],
                     [
-                        -5.8964469,
-                        56.0960466
+                        -4.518752,
+                        57.6951111
                     ],
                     [
-                        -6.0282829,
-                        56.0883855
+                        -4.5122925,
+                        57.6050682
                     ],
                     [
-                        -6.0392692,
-                        56.1557502
+                        -4.6789116,
+                        57.6016628
                     ],
                     [
-                        -6.3853385,
-                        56.1542205
+                        -4.666022,
+                        57.4218334
                     ],
                     [
-                        -6.3606193,
-                        55.96099
+                        -3.6677696,
+                        57.4394729
                     ],
                     [
-                        -6.2123039,
-                        55.9640647
+                        -3.671282,
+                        57.5295384
                     ],
                     [
-                        -6.2047508,
-                        55.9202269
+                        -3.3384979,
+                        57.5331943
                     ],
                     [
-                        -6.5185478,
-                        55.9129158
+                        -3.3330498,
+                        57.4438859
                     ],
                     [
-                        -6.5061881,
-                        55.7501763
+                        -2.8336466,
+                        57.4485275
                     ],
                     [
-                        -6.6764762,
-                        55.7409005
+                        -2.8236396,
+                        56.9992706
                     ],
                     [
-                        -6.6599967,
-                        55.6263176
+                        -2.3305398,
+                        57.0006693
                     ],
                     [
-                        -6.3551261,
-                        55.6232161
+                        -2.3298977,
+                        56.9113932
                     ],
                     [
-                        -6.3578727,
-                        55.5689002
+                        -2.6579889,
+                        56.9092901
                     ],
                     [
-                        -6.0392692,
-                        55.5720059
+                        -2.6559637,
+                        56.8198406
                     ],
                     [
-                        -6.0310294,
-                        55.6247669
+                        -2.8216747,
+                        56.8188467
                     ],
                     [
-                        -5.7398917,
-                        55.6309694
+                        -2.8184967,
+                        56.7295397
                     ],
                     [
-                        -5.7371452,
-                        55.4569279
+                        -3.1449248,
+                        56.7265508
                     ],
                     [
-                        -5.8964469,
-                        55.4600426
+                        -3.1435628,
+                        56.6362749
                     ],
                     [
-                        -5.8964469,
-                        55.2789864
+                        -3.4679089,
+                        56.6350265
                     ],
                     [
-                        -5.4350211,
-                        55.2821151
+                        -3.474265,
+                        56.7238108
                     ],
                     [
-                        -5.4405143,
-                        55.4506979
+                        -3.8011471,
+                        56.7188284
                     ],
                     [
-                        -5.2867057,
-                        55.4569279
+                        -3.785711,
+                        56.4493026
                     ],
                     [
-                        -5.3086784,
-                        55.4070602
+                        -3.946428,
+                        56.4457896
                     ],
                     [
-                        -4.9735954,
-                        55.4008223
+                        -3.9428873,
+                        56.2659777
                     ],
                     [
-                        -4.9845817,
-                        55.2038242
+                        -4.423146,
+                        56.2588459
                     ],
                     [
-                        -5.1493766,
-                        55.2038242
+                        -4.4141572,
+                        56.0815506
                     ],
                     [
-                        -5.1411369,
-                        55.037337
+                        -4.8944159,
+                        56.0708008
                     ],
                     [
-                        -5.2152946,
-                        55.0341891
-                    ]
-                ],
-                [
+                        -4.8791072,
+                        55.8896994
+                    ],
                     [
-                        -2.1646559,
-                        60.1622059
+                        -5.1994158,
+                        55.8821374
                     ],
                     [
-                        -1.9930299,
-                        60.1609801
+                        -5.1852906,
+                        55.7023791
                     ],
                     [
-                        -1.9946862,
-                        60.1035151
+                        -5.0273445,
+                        55.7067203
                     ],
                     [
-                        -2.1663122,
-                        60.104743
-                    ]
-                ],
-                [
+                        -5.0222081,
+                        55.6879046
+                    ],
                     [
-                        -1.5360658,
-                        59.8570831
+                        -4.897649,
+                        55.6907999
                     ],
                     [
-                        -1.3653566,
-                        59.8559841
+                        -4.8880181,
+                        55.6002822
                     ],
                     [
-                        -1.366847,
-                        59.7975565
+                        -4.7339244,
+                        55.6046348
                     ],
                     [
-                        -1.190628,
-                        59.7964199
+                        -4.7275038,
+                        55.5342082
                     ],
                     [
-                        -1.1862046,
-                        59.9695391
+                        -4.773732,
+                        55.5334815
                     ],
                     [
-                        -1.0078652,
-                        59.9683948
+                        -4.7685955,
+                        55.4447227
                     ],
                     [
-                        -1.0041233,
-                        60.114145
+                        -4.8494947,
+                        55.4418092
                     ],
                     [
-                        -0.8360832,
-                        60.1130715
+                        -4.8405059,
+                        55.3506535
                     ],
                     [
-                        -0.834574,
-                        60.1716772
+                        -4.8700405,
+                        55.3513836
                     ],
                     [
-                        -1.0074262,
-                        60.1727795
+                        -4.8649041,
+                        55.2629462
                     ],
                     [
-                        -1.0052165,
-                        60.2583924
+                        -4.9920314,
+                        55.2592875
                     ],
                     [
-                        -0.8299659,
-                        60.2572778
+                        -4.9907473,
+                        55.1691779
                     ],
                     [
-                        -0.826979,
-                        60.3726551
+                        -5.0600894,
+                        55.1655105
                     ],
                     [
-                        -0.6507514,
-                        60.3715381
+                        -5.0575212,
+                        55.0751884
                     ],
                     [
-                        -0.6477198,
-                        60.4882292
+                        -5.2141831,
+                        55.0722477
                     ],
                     [
-                        -0.9984896,
-                        60.4904445
+                        -5.1991766,
+                        54.8020337
                     ],
                     [
-                        -0.9970279,
-                        60.546555
+                        -5.0466316,
+                        54.8062205
                     ],
                     [
-                        -0.6425288,
-                        60.5443201
+                        -5.0502636,
+                        54.7244996
                     ],
                     [
-                        -0.6394896,
-                        60.6606792
+                        -4.9703591,
+                        54.7203043
                     ],
                     [
-                        -0.8148133,
-                        60.6617806
+                        -4.9776232,
+                        54.6215905
                     ],
                     [
-                        -0.8132987,
-                        60.7196112
+                        -4.796022,
+                        54.6342056
                     ],
                     [
-                        -0.6383298,
-                        60.7185141
+                        -4.796022,
+                        54.7307917
                     ],
                     [
-                        -0.635467,
-                        60.8275393
+                        -4.8977186,
+                        54.7265971
                     ],
                     [
-                        -0.797568,
-                        60.8285523
+                        -4.9086147,
+                        54.8145928
                     ],
                     [
-                        -0.9941426,
-                        60.8297807
+                        -4.8069181,
+                        54.8166856
                     ],
                     [
-                        -0.9954966,
-                        60.7782667
+                        -4.8105501,
+                        54.7915648
                     ],
                     [
-                        -1.1670282,
-                        60.7793403
+                        -4.6943253,
+                        54.7978465
                     ],
                     [
-                        -1.1700357,
-                        60.6646181
+                        -4.6761652,
+                        54.7244996
                     ],
                     [
-                        -1.5222599,
-                        60.6668304
+                        -4.5744686,
+                        54.7244996
                     ],
                     [
-                        -1.5237866,
-                        60.6084426
+                        -4.5599405,
+                        54.6426135
                     ],
                     [
-                        -1.6975673,
-                        60.609536
+                        -4.3093309,
+                        54.6384098
                     ],
                     [
-                        -1.7021271,
-                        60.4345249
+                        -4.3333262,
+                        54.8229889
                     ],
                     [
-                        -1.5260578,
-                        60.4334111
+                        -4.2626999,
+                        54.8274274
                     ],
                     [
-                        -1.5275203,
-                        60.3770719
+                        -4.2549952,
+                        54.7348587
                     ],
                     [
-                        -1.8751127,
-                        60.3792746
+                        -3.8338058,
+                        54.7400481
                     ],
                     [
-                        -1.8781372,
-                        60.2624647
+                        -3.836374,
+                        54.8141105
                     ],
                     [
-                        -1.7019645,
-                        60.2613443
+                        -3.7118149,
+                        54.8133706
                     ],
                     [
-                        -1.7049134,
-                        60.1470532
+                        -3.7143831,
+                        54.8318654
                     ],
                     [
-                        -1.528659,
-                        60.1459283
-                    ]
-                ],
-                [
+                        -3.5346072,
+                        54.8355633
+                    ],
                     [
-                        -0.9847667,
-                        60.8943762
+                        -3.5271039,
+                        54.9066228
                     ],
                     [
-                        -0.9860347,
-                        60.8361105
+                        -3.4808758,
+                        54.9084684
                     ],
                     [
-                        -0.8078362,
-                        60.8351904
+                        -3.4776655,
+                        54.7457328
                     ],
                     [
-                        -0.8065683,
-                        60.8934578
-                    ]
-                ],
-                [
+                        -3.5874573,
+                        54.744621
+                    ],
                     [
-                        -7.7696901,
-                        56.8788231
+                        -3.5836049,
+                        54.6546166
                     ],
                     [
-                        -7.7614504,
-                        56.7608274
+                        -3.7107322,
+                        54.6531308
                     ],
                     [
-                        -7.6009049,
-                        56.7641903
+                        -3.6991752,
+                        54.4550407
                     ],
                     [
-                        -7.5972473,
-                        56.819332
+                        -3.5746161,
+                        54.4572801
                     ],
                     [
-                        -7.4479894,
-                        56.8203948
+                        -3.5759002,
+                        54.3863042
                     ],
                     [
-                        -7.4489319,
-                        56.8794098
+                        -3.539945,
+                        54.3855564
                     ],
                     [
-                        -7.2841369,
-                        56.8794098
+                        -3.5386609,
+                        54.297224
                     ],
                     [
-                        -7.2813904,
-                        57.0471152
+                        -3.46033,
+                        54.2957252
                     ],
                     [
-                        -7.1303283,
-                        57.0515969
+                        -3.4590458,
+                        54.2079507
                     ],
                     [
-                        -7.1330749,
-                        57.511801
+                        -3.3807149,
+                        54.2102037
                     ],
                     [
-                        -6.96828,
-                        57.5147514
+                        -3.381999,
+                        54.1169788
                     ],
                     [
-                        -6.9765198,
-                        57.6854668
+                        -3.302878,
+                        54.1160656
                     ],
                     [
-                        -6.8062317,
-                        57.6913392
+                        -3.300154,
+                        54.0276224
                     ],
                     [
-                        -6.8089782,
-                        57.8041985
+                        -3.1013007,
+                        54.0292224
                     ],
                     [
-                        -6.6496765,
-                        57.8071252
+                        -3.093596,
+                        53.6062158
                     ],
                     [
-                        -6.6441833,
-                        57.8612267
+                        -3.2065981,
+                        53.6016441
                     ],
                     [
-                        -6.3200866,
-                        57.8626878
+                        -3.2091663,
+                        53.4917753
                     ],
                     [
-                        -6.3200866,
-                        58.1551617
+                        -3.2451215,
+                        53.4887193
                     ],
                     [
-                        -6.1607849,
-                        58.1522633
+                        -3.2348486,
+                        53.4045934
                     ],
                     [
-                        -6.1552917,
-                        58.20874
+                        -3.5276266,
+                        53.3999999
                     ],
                     [
-                        -5.9850036,
-                        58.2101869
+                        -3.5343966,
+                        53.328481
                     ],
                     [
-                        -5.9904968,
-                        58.2680163
+                        -3.6488053,
+                        53.3252272
                     ],
                     [
-                        -6.1497986,
-                        58.2665717
+                        -3.6527308,
+                        53.3057716
                     ],
                     [
-                        -6.1415588,
-                        58.5557514
+                        -3.7271873,
+                        53.3046865
                     ],
                     [
-                        -6.3173401,
-                        58.5557514
+                        -3.7315003,
+                        53.3945257
                     ],
                     [
-                        -6.3091003,
-                        58.4983923
+                        -3.9108315,
+                        53.3912769
                     ],
                     [
-                        -6.4876282,
-                        58.4955218
+                        -3.9071995,
+                        53.3023804
                     ],
                     [
-                        -6.4876282,
-                        58.4423768
+                        -3.9521457,
+                        53.3015665
                     ],
                     [
-                        -6.6606628,
-                        58.4395018
+                        -3.9566724,
+                        53.3912183
                     ],
                     [
-                        -6.6469299,
-                        58.3819525
+                        -4.1081979,
+                        53.3889209
                     ],
                     [
-                        -6.8117248,
-                        58.3805125
+                        -4.1081979,
+                        53.4072967
                     ],
                     [
-                        -6.8117248,
-                        58.3286357
+                        -4.2622916,
+                        53.4065312
                     ],
                     [
-                        -6.9792663,
-                        58.3286357
+                        -4.2635757,
+                        53.4753707
                     ],
                     [
-                        -6.9710266,
-                        58.2694608
+                        -4.638537,
+                        53.4677274
                     ],
                     [
-                        -7.1413147,
-                        58.2680163
+                        -4.6346847,
+                        53.3812621
                     ],
                     [
-                        -7.1403816,
-                        58.0358742
+                        -4.7091633,
+                        53.3774321
                     ],
                     [
-                        -7.3020636,
-                        58.0351031
+                        -4.7001745,
+                        53.1954965
                     ],
                     [
-                        -7.3030347,
-                        57.9774797
+                        -4.5499332,
+                        53.1962658
                     ],
                     [
-                        -7.1379539,
-                        57.9777372
+                        -4.5435126,
+                        53.1092488
                     ],
                     [
-                        -7.1413526,
-                        57.9202792
+                        -4.3919871,
+                        53.1100196
                     ],
                     [
-                        -7.1398961,
-                        57.8640206
+                        -4.3855666,
+                        53.0236002
                     ],
                     [
-                        -7.3020636,
-                        57.862471
+                        -4.6115707,
+                        53.0205105
                     ],
                     [
-                        -7.298484,
-                        57.7442293
+                        -4.603866,
+                        52.9284932
                     ],
                     [
-                        -7.4509193,
-                        57.7456951
+                        -4.7566756,
+                        52.9261709
                     ],
                     [
-                        -7.4550392,
-                        57.6899522
+                        -4.7476868,
+                        52.8370555
                     ],
                     [
-                        -7.6186131,
-                        57.6906048
+                        -4.8208813,
+                        52.8331768
                     ],
                     [
-                        -7.6198341,
-                        57.7456951
+                        -4.8208813,
+                        52.7446476
                     ],
                     [
-                        -7.7901222,
-                        57.7442293
+                        -4.3701572,
+                        52.7539749
                     ],
                     [
-                        -7.7873756,
-                        57.6855477
+                        -4.3765778,
+                        52.8401583
                     ],
                     [
-                        -7.6222332,
-                        57.6853817
+                        -4.2314728,
+                        52.8455875
                     ],
                     [
-                        -7.6173779,
-                        57.5712602
+                        -4.2237682,
+                        52.7586379
                     ],
                     [
-                        -7.788285,
-                        57.5709998
+                        -4.1056297,
+                        52.7570836
                     ],
                     [
-                        -7.7892561,
-                        57.512109
+                        -4.1015192,
+                        52.6714874
                     ],
                     [
-                        -7.7038025,
-                        57.5115874
+                        -4.1487355,
+                        52.6703862
                     ],
                     [
-                        -7.6999183,
-                        57.4546902
+                        -4.1305754,
+                        52.4008596
                     ],
                     [
-                        -7.5367796,
-                        57.4552126
+                        -4.1995838,
+                        52.3986435
                     ],
                     [
-                        -7.5348375,
-                        57.5126306
+                        -4.2050319,
+                        52.3110195
                     ],
                     [
-                        -7.4581235,
-                        57.5131521
+                        -4.3466808,
+                        52.303247
                     ],
                     [
-                        -7.4552103,
-                        57.2824165
+                        -4.3484968,
+                        52.2365693
                     ],
                     [
-                        -7.6115515,
-                        57.2845158
+                        -4.4901457,
+                        52.2332328
                     ],
                     [
-                        -7.6144647,
-                        57.2272651
+                        -4.4883297,
+                        52.2098702
                     ],
                     [
-                        -7.451326,
-                        57.2256881
+                        -4.6572188,
+                        52.2098702
                     ],
                     [
-                        -7.451326,
-                        57.1103873
+                        -4.6590348,
+                        52.1385939
                     ],
                     [
-                        -7.6164068,
-                        57.1088053
+                        -4.7788916,
+                        52.13525
                     ],
                     [
-                        -7.603783,
-                        56.8792358
-                    ]
-                ],
-                [
+                        -4.7807076,
+                        52.1162967
+                    ],
                     [
-                        -1.7106618,
-                        59.5626284
+                        -4.9259885,
+                        52.1140663
                     ],
                     [
-                        -1.5417509,
-                        59.562215
+                        -4.9187245,
+                        52.0392855
                     ],
                     [
-                        -1.5423082,
-                        59.5037224
+                        -5.2365265,
+                        52.0314653
                     ],
                     [
-                        -1.7112191,
-                        59.5041365
-                    ]
-                ]
-            ],
-            "terms_url": "http://geo.nls.uk/maps/",
-            "terms_text": "National Library of Scotland Historic Maps"
-        },
-        {
-            "name": "New & Misaligned TIGER Roads",
-            "type": "tms",
-            "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap",
-            "template": "http://{switch:a,b,c}.tiles.mapbox.com/v3/enf.y5c4ygb9,enf.ho20a3n1,enf.game1617/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                0,
-                22
-            ],
-            "polygon": [
-                [
+                        -5.2347105,
+                        51.9442339
+                    ],
                     [
-                        -124.7617886,
-                        48.4130148
+                        -5.3473032,
+                        51.9408755
                     ],
                     [
-                        -124.6059492,
-                        45.90245
+                        -5.3473032,
+                        51.9195995
                     ],
                     [
-                        -124.9934269,
-                        40.0557614
+                        -5.4925842,
+                        51.9162392
                     ],
                     [
-                        -122.5369737,
-                        36.8566086
+                        -5.4853201,
+                        51.8265386
                     ],
                     [
-                        -119.9775867,
-                        33.0064099
+                        -5.1983903,
+                        51.8321501
                     ],
                     [
-                        -117.675935,
-                        32.4630223
+                        -5.1893102,
+                        51.7625177
                     ],
                     [
-                        -114.8612307,
-                        32.4799891
+                        -5.335825,
+                        51.7589528
                     ],
                     [
-                        -111.0089311,
-                        31.336015
+                        -5.3281204,
+                        51.6686495
                     ],
                     [
-                        -108.1992687,
-                        31.3260016
+                        -5.1836575,
+                        51.6730296
                     ],
                     [
-                        -108.1871123,
-                        31.7755116
+                        -5.1836575,
+                        51.6539134
                     ],
                     [
-                        -106.5307225,
-                        31.7820947
+                        -5.0674452,
+                        51.6578966
                     ],
                     [
-                        -106.4842052,
-                        31.7464455
+                        -5.0603825,
+                        51.5677905
                     ],
                     [
-                        -106.429317,
-                        31.7520583
+                        -4.5974594,
+                        51.5809588
                     ],
                     [
-                        -106.2868855,
-                        31.5613291
+                        -4.60388,
+                        51.6726314
                     ],
                     [
-                        -106.205248,
-                        31.446704
+                        -4.345773,
+                        51.6726314
                     ],
                     [
-                        -105.0205259,
-                        30.5360988
+                        -4.3355001,
+                        51.4962964
                     ],
                     [
-                        -104.5881916,
-                        29.6997856
+                        -3.9528341,
+                        51.5106841
                     ],
                     [
-                        -103.2518856,
-                        28.8908685
+                        -3.9425611,
+                        51.5905333
                     ],
                     [
-                        -102.7173632,
-                        29.3920567
+                        -3.8809237,
+                        51.5953198
                     ],
                     [
-                        -102.1513983,
-                        29.7475702
+                        -3.8706508,
+                        51.5074872
                     ],
                     [
-                        -101.2552871,
-                        29.4810523
+                        -3.7679216,
+                        51.4978952
                     ],
                     [
-                        -100.0062436,
-                        28.0082173
+                        -3.7550805,
+                        51.4242895
                     ],
                     [
-                        -99.2351068,
-                        26.4475962
+                        -3.5855774,
+                        51.41468
                     ],
                     [
-                        -98.0109067,
-                        25.9928035
+                        -3.5778727,
+                        51.3329177
                     ],
                     [
-                        -97.435024,
-                        25.8266009
+                        -3.0796364,
+                        51.3329177
                     ],
                     [
-                        -96.9555259,
-                        25.9821589
+                        -3.0770682,
+                        51.2494018
                     ],
                     [
-                        -96.8061741,
-                        27.7978168
+                        -3.7216935,
+                        51.2381477
                     ],
                     [
-                        -95.5563349,
-                        28.5876066
+                        -3.7216935,
+                        51.2558315
                     ],
                     [
-                        -93.7405308,
-                        29.4742093
+                        -3.8706508,
+                        51.2558315
                     ],
                     [
-                        -90.9028456,
-                        28.8564513
+                        -3.8680825,
+                        51.2365398
                     ],
                     [
-                        -88.0156706,
-                        28.9944338
+                        -4.2944084,
+                        51.2252825
                     ],
                     [
-                        -88.0162494,
-                        30.0038862
+                        -4.289272,
+                        51.0496352
                     ],
                     [
-                        -86.0277506,
-                        30.0047454
+                        -4.5692089,
+                        51.0431767
                     ],
                     [
-                        -84.0187909,
-                        28.9961781
+                        -4.5624122,
+                        50.9497388
                     ],
                     [
-                        -81.9971976,
-                        25.9826768
+                        -4.5905604,
+                        50.9520269
                     ],
                     [
-                        -81.9966618,
-                        25.0134917
+                        -4.5896524,
+                        50.8627065
                     ],
                     [
-                        -84.0165592,
-                        25.0125783
+                        -4.6296046,
+                        50.8592677
                     ],
                     [
-                        -84.0160068,
-                        24.0052745
+                        -4.6226411,
+                        50.7691513
                     ],
                     [
-                        -80.0199985,
-                        24.007096
+                        -4.6952816,
+                        50.7680028
                     ],
                     [
-                        -79.8901116,
-                        26.8550713
+                        -4.6934655,
+                        50.6967379
                     ],
                     [
-                        -80.0245309,
-                        32.0161282
+                        -4.8342064,
+                        50.6938621
                     ],
                     [
-                        -75.4147385,
-                        35.0531894
+                        -4.8296664,
+                        50.6046231
                     ],
                     [
-                        -74.0211163,
-                        39.5727927
+                        -4.9676833,
+                        50.6000126
                     ],
                     [
-                        -72.002019,
-                        40.9912464
+                        -4.9685913,
+                        50.5821427
                     ],
                     [
-                        -69.8797398,
-                        40.9920457
+                        -5.1084242,
+                        50.5786832
                     ],
                     [
-                        -69.8489304,
-                        43.2619916
+                        -5.1029762,
+                        50.4892254
                     ],
                     [
-                        -66.9452845,
-                        44.7104937
+                        -5.1311244,
+                        50.48807
                     ],
                     [
-                        -67.7596632,
-                        47.0990024
+                        -5.1274923,
+                        50.4163798
                     ],
                     [
-                        -69.2505131,
-                        47.5122328
+                        -5.2664172,
+                        50.4117509
                     ],
                     [
-                        -70.4614886,
-                        46.2176574
+                        -5.2609692,
+                        50.3034214
                     ],
                     [
-                        -71.412273,
-                        45.254878
+                        -5.5124868,
+                        50.2976214
                     ],
                     [
-                        -72.0222508,
-                        45.0059846
+                        -5.5061308,
+                        50.2256428
                     ],
                     [
-                        -75.0798841,
-                        44.9802854
+                        -5.6468717,
+                        50.2209953
+                    ]
+                ],
+                [
+                    [
+                        -5.1336607,
+                        55.2630226
                     ],
                     [
-                        -76.9023061,
-                        43.8024568
+                        -5.1021999,
+                        55.2639372
                     ],
                     [
-                        -78.7623935,
-                        43.6249578
+                        -5.0999527,
+                        55.2458239
                     ],
                     [
-                        -79.15798,
-                        43.4462589
+                        -5.1322161,
+                        55.2446343
+                    ]
+                ],
+                [
+                    [
+                        -5.6431878,
+                        55.5095745
                     ],
                     [
-                        -79.0060087,
-                        42.8005317
+                        -5.4861028,
+                        55.5126594
                     ],
                     [
-                        -82.662475,
-                        41.6889458
+                        -5.4715747,
+                        55.3348829
                     ],
                     [
-                        -82.1761642,
-                        43.588535
+                        -5.6277517,
+                        55.3302345
+                    ]
+                ],
+                [
+                    [
+                        -4.7213517,
+                        51.2180246
                     ],
                     [
-                        -83.2813977,
-                        46.138853
+                        -4.5804201,
+                        51.2212417
                     ],
                     [
-                        -87.5064535,
-                        48.0142702
+                        -4.5746416,
+                        51.1306736
                     ],
                     [
-                        -88.3492194,
-                        48.2963271
+                        -4.7174993,
+                        51.1280545
+                    ]
+                ],
+                [
+                    [
+                        -5.1608796,
+                        55.4153626
                     ],
                     [
-                        -89.4353148,
-                        47.9837822
+                        -5.0045387,
+                        55.4190069
                     ],
                     [
-                        -93.9981078,
-                        49.0067142
+                        -5.0184798,
+                        55.6153521
                     ],
                     [
-                        -95.1105379,
-                        49.412004
+                        -5.1755648,
+                        55.6138137
+                    ]
+                ]
+            ],
+            "terms_url": "http://geo.nls.uk/maps/",
+            "terms_text": "National Library of Scotland Historic Maps"
+        },
+        {
+            "name": "NLS - OS 6-inch Scotland 1842-82",
+            "type": "tms",
+            "template": "http://geo.nls.uk/maps/os/six_inch/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                5,
+                16
+            ],
+            "polygon": [
+                [
+                    [
+                        -5.2112173,
+                        54.8018593
                     ],
                     [
-                        -96.0131199,
-                        49.0060547
+                        -5.0642752,
+                        54.8026508
                     ],
                     [
-                        -123.3228926,
-                        49.0042878
+                        -5.0560354,
+                        54.6305176
                     ],
                     [
-                        -123.2275233,
-                        48.1849927
-                    ]
-                ],
-                [
+                        -4.3158316,
+                        54.6297227
+                    ],
                     [
-                        -160.5787616,
-                        22.5062947
+                        -4.3117117,
+                        54.7448258
                     ],
                     [
-                        -160.5782192,
-                        21.4984647
+                        -3.8530325,
+                        54.7464112
                     ],
                     [
-                        -158.7470604,
-                        21.2439843
+                        -3.8530325,
+                        54.8034424
                     ],
                     [
-                        -157.5083185,
-                        20.995803
+                        -3.5522818,
+                        54.8034424
                     ],
                     [
-                        -155.9961942,
-                        18.7790194
+                        -3.5522818,
+                        54.8374644
                     ],
                     [
-                        -154.6217803,
-                        18.7586966
+                        -3.468511,
+                        54.8406277
                     ],
                     [
-                        -154.6890176,
-                        19.8805722
+                        -3.4657644,
+                        54.8983158
                     ],
                     [
-                        -156.2927622,
-                        21.2225888
+                        -3.3847403,
+                        54.8991055
                     ],
                     [
-                        -157.5047384,
-                        21.9984962
+                        -3.3888601,
+                        54.9559214
                     ],
                     [
-                        -159.0093692,
-                        22.5070181
-                    ]
-                ],
-                [
+                        -3.0920786,
+                        54.9539468
+                    ],
                     [
-                        -167.1571546,
-                        68.721974
+                        -3.0392359,
+                        54.9923274
                     ],
                     [
-                        -164.8553982,
-                        67.0255078
+                        -3.0212713,
+                        55.0493881
                     ],
                     [
-                        -168.002195,
-                        66.0017503
+                        -2.9591232,
+                        55.0463283
                     ],
                     [
-                        -169.0087448,
-                        66.001546
+                        -2.9202807,
+                        55.0666294
                     ],
                     [
-                        -169.0075381,
-                        64.9987675
+                        -2.7857081,
+                        55.068652
                     ],
                     [
-                        -172.5143281,
-                        63.8767267
+                        -2.7852225,
+                        55.0914426
                     ],
                     [
-                        -173.8197023,
-                        59.74014
+                        -2.7337562,
+                        55.0922761
                     ],
                     [
-                        -162.5018149,
-                        58.0005815
+                        -2.737616,
+                        55.151204
                     ],
                     [
-                        -160.0159024,
-                        58.0012389
+                        -2.7648395,
+                        55.1510672
                     ],
                     [
-                        -160.0149725,
-                        57.000035
+                        -2.7013114,
+                        55.1722505
                     ],
                     [
-                        -160.5054788,
-                        56.9999017
+                        -2.6635459,
+                        55.2192808
                     ],
                     [
-                        -165.8092575,
-                        54.824847
+                        -2.6460364,
+                        55.2188891
                     ],
                     [
-                        -178.000097,
-                        52.2446469
+                        -2.629042,
+                        55.2233933
                     ],
                     [
-                        -177.9992996,
-                        51.2554252
+                        -2.6317886,
+                        55.2287781
                     ],
                     [
-                        -171.4689067,
-                        51.8215329
+                        -2.6235488,
+                        55.2446345
                     ],
                     [
-                        -162.40251,
-                        53.956664
+                        -2.6197723,
+                        55.2454663
                     ],
                     [
-                        -159.0075717,
-                        55.002502
+                        -2.6099017,
+                        55.2454174
                     ],
                     [
-                        -158.0190709,
-                        55.0027849
+                        -2.6099876,
+                        55.2486466
                     ],
                     [
-                        -151.9963213,
-                        55.9991902
+                        -2.6408121,
+                        55.2590039
                     ],
                     [
-                        -151.500341,
-                        57.9987853
+                        -2.6247896,
+                        55.2615631
                     ],
                     [
-                        -151.5012894,
-                        58.9919816
+                        -2.6045186,
+                        55.2823081
                     ],
                     [
-                        -138.5159989,
-                        58.9953194
+                        -2.5693176,
+                        55.296132
                     ],
                     [
-                        -138.5150471,
-                        57.9986434
+                        -2.5479542,
+                        55.3121617
                     ],
                     [
-                        -133.9948193,
-                        54.0031685
+                        -2.5091116,
+                        55.3234891
                     ],
                     [
-                        -130.0044418,
-                        54.0043387
+                        -2.4780376,
+                        55.3494471
                     ],
                     [
-                        -130.0070826,
-                        57.0000507
+                        -2.4421083,
+                        55.3533118
                     ],
                     [
-                        -131.975877,
-                        56.9995156
+                        -2.4052079,
+                        55.3439256
                     ],
                     [
-                        -135.1229873,
-                        59.756601
+                        -2.3726772,
+                        55.3447539
                     ],
                     [
-                        -138.0071813,
-                        59.991805
+                        -2.3221819,
+                        55.3687665
                     ],
                     [
-                        -139.1715881,
-                        60.4127229
+                        -2.3241241,
+                        55.3999337
                     ],
                     [
-                        -140.9874011,
-                        61.0118551
+                        -2.2576062,
+                        55.425015
                     ],
                     [
-                        -140.9683975,
-                        69.9535069
+                        -2.1985547,
+                        55.4273529
                     ],
                     [
-                        -156.176891,
-                        71.5633329
+                        -2.1484296,
+                        55.4717466
                     ],
                     [
-                        -160.413634,
-                        70.7397728
+                        -2.1944348,
+                        55.484199
                     ],
                     [
-                        -163.0218273,
-                        69.9707435
+                        -2.2040479,
+                        55.529306
                     ],
                     [
-                        -164.9717003,
-                        68.994689
-                    ]
-                ]
-            ],
-            "overlay": true
-        },
-        {
-            "name": "OS 1:25k historic (OSM)",
-            "type": "tms",
-            "template": "http://ooc.openstreetmap.org/os1/{zoom}/{x}/{y}.jpg",
-            "scaleExtent": [
-                6,
-                17
-            ],
-            "polygon": [
-                [
-                    [
-                        -9,
-                        49.8
+                        -2.2960584,
+                        55.6379722
                     ],
                     [
-                        -9,
-                        61.1
+                        -2.2177808,
+                        55.6379722
                     ],
                     [
-                        1.9,
-                        61.1
+                        -2.1059266,
+                        55.7452498
                     ],
                     [
-                        1.9,
-                        49.8
+                        -1.9716874,
+                        55.7462161
                     ],
                     [
-                        -9,
-                        49.8
-                    ]
-                ]
-            ]
-        },
-        {
-            "name": "OS New Popular Edition historic",
-            "type": "tms",
-            "template": "http://ooc.openstreetmap.org/npe/{zoom}/{x}/{y}.png",
-            "polygon": [
-                [
-                    [
-                        -5.8,
-                        49.8
+                        -1.9697453,
+                        55.9190951
                     ],
                     [
-                        -5.8,
-                        55.8
+                        -2.1201694,
+                        55.9207115
                     ],
                     [
-                        1.9,
-                        55.8
+                        -2.1242893,
+                        55.9776133
                     ],
                     [
-                        1.9,
-                        49.8
+                        -2.3440159,
+                        55.9783817
                     ],
                     [
-                        -5.8,
-                        49.8
-                    ]
-                ]
-            ]
-        },
-        {
-            "name": "OS OpenData Locator",
-            "type": "tms",
-            "template": "http://tiles.itoworld.com/os_locator/{zoom}/{x}/{y}.png",
-            "polygon": [
-                [
-                    [
-                        -9,
-                        49.8
+                        -2.3440159,
+                        56.0390349
                     ],
                     [
-                        -9,
-                        61.1
+                        -2.5046909,
+                        56.0413363
                     ],
                     [
-                        1.9,
-                        61.1
+                        -2.500571,
+                        56.1003588
                     ],
                     [
-                        1.9,
-                        49.8
+                        -2.8823459,
+                        56.0957629
                     ],
                     [
-                        -9,
-                        49.8
-                    ]
-                ]
-            ],
-            "overlay": true
-        },
-        {
-            "name": "OS OpenData StreetView",
-            "type": "tms",
-            "template": "http://os.openstreetmap.org/sv/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                1,
-                18
-            ],
-            "polygon": [
-                [
+                        -2.8823459,
+                        56.1722898
+                    ],
                     [
-                        -5.8292886,
-                        50.0229734
+                        -2.4126804,
+                        56.1692316
                     ],
                     [
-                        -5.8292886,
-                        50.254819
+                        -2.4181736,
+                        56.2334017
                     ],
                     [
-                        -5.373356,
-                        50.254819
+                        -2.5857151,
+                        56.2303484
                     ],
                     [
-                        -5.373356,
-                        50.3530588
+                        -2.5719822,
+                        56.3416356
                     ],
                     [
-                        -5.1756021,
-                        50.3530588
+                        -2.7257908,
+                        56.3462022
                     ],
                     [
-                        -5.1756021,
-                        50.5925406
+                        -2.7312839,
+                        56.4343808
                     ],
                     [
-                        -4.9970743,
-                        50.5925406
+                        -2.6928318,
+                        56.4343808
                     ],
                     [
-                        -4.9970743,
-                        50.6935617
+                        -2.6928318,
+                        56.4859769
                     ],
                     [
-                        -4.7965738,
-                        50.6935617
+                        -2.5307834,
+                        56.4935587
                     ],
                     [
-                        -4.7965738,
-                        50.7822112
+                        -2.5307834,
+                        56.570806
                     ],
                     [
-                        -4.6949503,
-                        50.7822112
+                        -2.5302878,
+                        56.6047947
                     ],
                     [
-                        -4.6949503,
-                        50.9607371
+                        -2.3732428,
+                        56.6044452
                     ],
                     [
-                        -4.6043131,
-                        50.9607371
+                        -2.3684363,
+                        56.7398824
                     ],
                     [
-                        -4.6043131,
-                        51.0692066
+                        -2.3292975,
+                        56.7398824
                     ],
                     [
-                        -4.3792215,
-                        51.0692066
+                        -2.3292975,
+                        56.7888065
                     ],
                     [
-                        -4.3792215,
-                        51.2521782
+                        -2.3145346,
+                        56.7891826
                     ],
                     [
-                        -3.9039346,
-                        51.2521782
+                        -2.3148779,
+                        56.7967036
                     ],
                     [
-                        -3.9039346,
-                        51.2916998
+                        -2.171369,
+                        56.7967036
                     ],
                     [
-                        -3.7171671,
-                        51.2916998
+                        -2.1703979,
+                        56.9710595
                     ],
                     [
-                        -3.7171671,
-                        51.2453014
+                        -2.0101725,
+                        56.9694716
                     ],
                     [
-                        -3.1486246,
-                        51.2453014
+                        -2.0101725,
+                        57.0846832
                     ],
                     [
-                        -3.1486246,
-                        51.362067
+                        -2.0817687,
+                        57.085349
                     ],
                     [
-                        -3.7446329,
-                        51.362067
+                        -2.0488097,
+                        57.1259963
                     ],
                     [
-                        -3.7446329,
-                        51.4340386
+                        -2.0409133,
+                        57.126369
                     ],
                     [
-                        -3.8297769,
-                        51.4340386
+                        -2.0383434,
+                        57.2411129
                     ],
                     [
-                        -3.8297769,
-                        51.5298246
+                        -1.878118,
+                        57.2421638
                     ],
                     [
-                        -4.0852091,
-                        51.5298246
+                        -1.8771469,
+                        57.2978175
                     ],
                     [
-                        -4.0852091,
-                        51.4939284
+                        -1.9868771,
+                        57.2983422
                     ],
                     [
-                        -4.3792215,
-                        51.4939284
+                        -1.9082209,
+                        57.3560063
                     ],
                     [
-                        -4.3792215,
-                        51.5427168
+                        -1.8752048,
+                        57.3560063
                     ],
                     [
-                        -5.1444195,
-                        51.5427168
+                        -1.8761758,
+                        57.3769527
                     ],
                     [
-                        -5.1444195,
-                        51.6296003
+                        -1.8120857,
+                        57.4120111
                     ],
                     [
-                        -5.7387103,
-                        51.6296003
+                        -1.7120661,
+                        57.4120111
                     ],
                     [
-                        -5.7387103,
-                        51.774037
+                        -1.7034646,
+                        57.6441388
                     ],
                     [
-                        -5.5095393,
-                        51.774037
+                        -1.8666032,
+                        57.6451781
                     ],
                     [
-                        -5.5095393,
-                        51.9802596
+                        -1.8646611,
+                        57.7033351
                     ],
                     [
-                        -5.198799,
-                        51.9802596
+                        -3.1204292,
+                        57.7064705
                     ],
                     [
-                        -5.198799,
-                        52.0973358
+                        -3.1218025,
+                        57.7504652
                     ],
                     [
-                        -4.8880588,
-                        52.0973358
+                        -3.4445259,
+                        57.7526635
                     ],
                     [
-                        -4.8880588,
-                        52.1831557
+                        -3.4472724,
+                        57.7138067
                     ],
                     [
-                        -4.4957492,
-                        52.1831557
+                        -3.5145637,
+                        57.7094052
                     ],
                     [
-                        -4.4957492,
-                        52.2925739
+                        -3.5118171,
+                        57.6939956
                     ],
                     [
-                        -4.3015365,
-                        52.2925739
+                        -3.7645027,
+                        57.6917938
                     ],
                     [
-                        -4.3015365,
-                        52.3685318
+                        -3.7672492,
+                        57.6344975
                     ],
                     [
-                        -4.1811246,
-                        52.3685318
+                        -3.842378,
+                        57.6288312
                     ],
                     [
-                        -4.1811246,
-                        52.7933685
+                        -3.8438346,
+                        57.5965825
                     ],
                     [
-                        -4.4413696,
-                        52.7933685
+                        -3.9414265,
+                        57.5916386
                     ],
                     [
-                        -4.4413696,
-                        52.7369614
+                        -3.9404554,
+                        57.6537782
                     ],
                     [
-                        -4.8569847,
-                        52.7369614
+                        -3.8894746,
+                        57.6529989
                     ],
                     [
-                        -4.8569847,
-                        52.9317255
+                        -3.8826772,
+                        57.7676408
                     ],
                     [
-                        -4.7288044,
-                        52.9317255
+                        -3.7224517,
+                        57.766087
                     ],
                     [
-                        -4.7288044,
-                        53.5038599
+                        -3.7195385,
+                        57.8819201
                     ],
                     [
-                        -4.1578191,
-                        53.5038599
+                        -3.9146888,
+                        57.8853352
                     ],
                     [
-                        -4.1578191,
-                        53.4113498
+                        -3.916062,
+                        57.9546243
                     ],
                     [
-                        -3.3110518,
-                        53.4113498
+                        -3.745774,
+                        57.9538956
                     ],
                     [
-                        -3.3110518,
-                        53.5038599
+                        -3.7471473,
+                        58.0688409
                     ],
                     [
-                        -3.2333667,
-                        53.5038599
+                        -3.5837256,
+                        58.0695672
                     ],
                     [
-                        -3.2333667,
-                        54.0159169
+                        -3.5837256,
+                        58.1116689
                     ],
                     [
-                        -3.3926211,
-                        54.0159169
+                        -3.4560096,
+                        58.1138452
                     ],
                     [
-                        -3.3926211,
-                        54.1980953
+                        -3.4544646,
+                        58.228503
                     ],
                     [
-                        -3.559644,
-                        54.1980953
+                        -3.4379851,
+                        58.2283222
                     ],
                     [
-                        -3.559644,
-                        54.433732
+                        -3.4243233,
+                        58.2427725
                     ],
                     [
-                        -3.7188984,
-                        54.433732
+                        -3.412307,
+                        58.2438567
                     ],
                     [
-                        -3.7188984,
-                        54.721897
+                        -3.3735115,
+                        58.2695057
                     ],
                     [
-                        -4.3015365,
-                        54.721897
+                        -3.3063919,
+                        58.2862038
                     ],
                     [
-                        -4.3015365,
-                        54.6140739
+                        -3.1229154,
+                        58.2859395
                     ],
                     [
-                        -5.0473132,
-                        54.6140739
+                        -3.123602,
+                        58.3443661
                     ],
                     [
-                        -5.0473132,
-                        54.7532915
+                        -2.9574338,
+                        58.3447264
                     ],
                     [
-                        -5.2298731,
-                        54.7532915
+                        -2.951254,
+                        58.6422011
                     ],
                     [
-                        -5.2298731,
-                        55.2190799
+                        -2.8812162,
+                        58.6429157
                     ],
                     [
-                        -5.6532567,
-                        55.2190799
+                        -2.8851004,
+                        58.8112825
                     ],
                     [
-                        -5.6532567,
-                        55.250088
+                        -2.7180775,
+                        58.8142997
                     ],
                     [
-                        -5.8979647,
-                        55.250088
+                        -2.7161354,
+                        58.8715749
                     ],
                     [
-                        -5.8979647,
-                        55.4822462
+                        -2.556881,
+                        58.8775984
                     ],
                     [
-                        -6.5933212,
-                        55.4822462
+                        -2.5544533,
+                        58.9923453
                     ],
                     [
-                        -6.5933212,
-                        56.3013441
+                        -2.5567617,
+                        59.0483775
                     ],
                     [
-                        -7.1727691,
-                        56.3013441
+                        -2.391893,
+                        59.0485996
                     ],
                     [
-                        -7.1727691,
-                        56.5601822
+                        -2.3918002,
+                        59.1106996
                     ],
                     [
-                        -6.8171722,
-                        56.5601822
+                        -2.4733695,
+                        59.1106996
                     ],
                     [
-                        -6.8171722,
-                        56.6991713
+                        -2.5591563,
+                        59.1783028
                     ],
                     [
-                        -6.5315276,
-                        56.6991713
+                        -2.5630406,
+                        59.2210646
                     ],
                     [
-                        -6.5315276,
-                        56.9066964
+                        -2.3921334,
+                        59.224046
                     ],
                     [
-                        -6.811679,
-                        56.9066964
+                        -2.3911409,
+                        59.2740075
                     ],
                     [
-                        -6.811679,
-                        57.3716613
+                        -2.3639512,
+                        59.2745036
                     ],
                     [
-                        -6.8721038,
-                        57.3716613
+                        -2.3658933,
+                        59.285417
                     ],
                     [
-                        -6.8721038,
-                        57.5518893
+                        -2.3911409,
+                        59.284921
                     ],
                     [
-                        -7.0973235,
-                        57.5518893
+                        -2.3911409,
+                        59.3379505
                     ],
                     [
-                        -7.0973235,
-                        57.2411085
+                        -2.2221759,
+                        59.3381981
                     ],
                     [
-                        -7.1742278,
-                        57.2411085
+                        -2.2233897,
+                        59.395965
                     ],
                     [
-                        -7.1742278,
-                        56.9066964
+                        -2.3758467,
+                        59.396583
                     ],
                     [
-                        -7.3719817,
-                        56.9066964
+                        -2.3899271,
+                        59.4026383
                     ],
                     [
-                        -7.3719817,
-                        56.8075885
+                        -2.4008516,
+                        59.3962122
                     ],
                     [
-                        -7.5202972,
-                        56.8075885
+                        -2.5637882,
+                        59.3952604
                     ],
                     [
-                        -7.5202972,
-                        56.7142479
+                        -2.5637882,
+                        59.3385811
                     ],
                     [
-                        -7.8306806,
-                        56.7142479
+                        -2.7320164,
+                        59.3375306
                     ],
                     [
-                        -7.8306806,
-                        56.8994605
+                        -2.7333896,
+                        59.3952604
                     ],
                     [
-                        -7.6494061,
-                        56.8994605
+                        -3.0726511,
+                        59.3931174
                     ],
                     [
-                        -7.6494061,
-                        57.4739617
+                        -3.0703404,
+                        59.3354759
                     ],
                     [
-                        -7.8306806,
-                        57.4739617
+                        -3.0753186,
+                        59.3355634
                     ],
                     [
-                        -7.8306806,
-                        57.7915584
+                        -3.0749753,
+                        59.3292593
                     ],
                     [
-                        -7.4736249,
-                        57.7915584
-                    ],
-                    [
-                        -7.4736249,
-                        58.086063
+                        -3.0698254,
+                        59.3289091
                     ],
                     [
-                        -7.1879804,
-                        58.086063
+                        -3.069801,
+                        59.2196159
                     ],
                     [
-                        -7.1879804,
-                        58.367197
+                        -3.2363384,
+                        59.2166341
                     ],
                     [
-                        -6.8034589,
-                        58.367197
+                        -3.2336751,
+                        59.1606496
                     ],
                     [
-                        -6.8034589,
-                        58.4155786
+                        -3.4032766,
+                        59.1588895
                     ],
                     [
-                        -6.638664,
-                        58.4155786
+                        -3.394086,
+                        58.9279316
                     ],
                     [
-                        -6.638664,
-                        58.4673277
+                        -3.5664497,
+                        58.9259268
                     ],
                     [
-                        -6.5178143,
-                        58.4673277
+                        -3.5611089,
+                        58.8679885
                     ],
                     [
-                        -6.5178143,
-                        58.5625632
+                        -3.392508,
+                        58.8699339
                     ],
                     [
-                        -6.0536224,
-                        58.5625632
+                        -3.3894734,
+                        58.8698711
                     ],
                     [
-                        -6.0536224,
-                        58.1568843
+                        -3.3891093,
+                        58.8684905
                     ],
                     [
-                        -6.1470062,
-                        58.1568843
+                        -3.3912942,
+                        58.868616
                     ],
                     [
-                        -6.1470062,
-                        58.1105865
+                        -3.3884161,
+                        58.7543084
                     ],
                     [
-                        -6.2799798,
-                        58.1105865
+                        -3.2238208,
+                        58.7555677
                     ],
                     [
-                        -6.2799798,
-                        57.7122664
+                        -3.2189655,
+                        58.691289
                     ],
                     [
-                        -6.1591302,
-                        57.7122664
+                        -3.4634113,
+                        58.6905753
                     ],
                     [
-                        -6.1591302,
-                        57.6667563
+                        -3.4551716,
+                        58.6341518
                     ],
                     [
-                        -5.9339104,
-                        57.6667563
+                        -3.787508,
+                        58.6341518
                     ],
                     [
-                        -5.9339104,
-                        57.8892524
+                        -3.7861347,
+                        58.5769211
                     ],
                     [
-                        -5.80643,
-                        57.8892524
+                        -3.9028645,
+                        58.5733411
                     ],
                     [
-                        -5.80643,
-                        57.9621767
+                        -3.9028645,
+                        58.6477304
                     ],
                     [
-                        -5.6141692,
-                        57.9621767
+                        -4.0690327,
+                        58.6491594
                     ],
                     [
-                        -5.6141692,
-                        58.0911236
+                        -4.0690327,
+                        58.5912376
                     ],
                     [
-                        -5.490819,
-                        58.0911236
+                        -4.7364521,
+                        58.5933845
                     ],
                     [
-                        -5.490819,
-                        58.3733281
+                        -4.7364521,
+                        58.6505884
                     ],
                     [
-                        -5.3199118,
-                        58.3733281
+                        -5.0715351,
+                        58.6520173
                     ],
                     [
-                        -5.3199118,
-                        58.75015
+                        -5.0654779,
+                        58.5325854
                     ],
                     [
-                        -3.5719977,
-                        58.75015
+                        -5.2332047,
+                        58.5316087
                     ],
                     [
-                        -3.5719977,
-                        59.2091788
+                        -5.2283494,
+                        58.4719947
                     ],
                     [
-                        -3.1944501,
-                        59.2091788
+                        -5.2424298,
+                        58.4719947
                     ],
                     [
-                        -3.1944501,
-                        59.4759216
+                        -5.2366034,
+                        58.4089731
                     ],
                     [
-                        -2.243583,
-                        59.4759216
+                        -5.2283494,
+                        58.4094818
                     ],
                     [
-                        -2.243583,
-                        59.1388749
+                        -5.2210664,
+                        58.3005859
                     ],
                     [
-                        -2.4611012,
-                        59.1388749
+                        -5.5657939,
+                        58.2959933
                     ],
                     [
-                        -2.4611012,
-                        58.8185938
+                        -5.5580254,
+                        58.2372573
                     ],
                     [
-                        -2.7407675,
-                        58.8185938
+                        -5.4146722,
+                        58.2401326
                     ],
                     [
-                        -2.7407675,
-                        58.5804743
+                        -5.4141866,
+                        58.2267768
                     ],
                     [
-                        -2.9116746,
-                        58.5804743
+                        -5.3885749,
+                        58.2272242
                     ],
                     [
-                        -2.9116746,
-                        58.1157523
+                        -5.382714,
+                        58.1198615
                     ],
                     [
-                        -3.4865441,
-                        58.1157523
+                        -5.51043,
+                        58.1191362
                     ],
                     [
-                        -3.4865441,
-                        57.740386
+                        -5.5114011,
+                        58.006214
                     ],
                     [
-                        -1.7153245,
-                        57.740386
+                        -5.6745397,
+                        58.0041559
                     ],
                     [
-                        -1.7153245,
-                        57.2225558
+                        -5.6716266,
+                        57.9449366
                     ],
                     [
-                        -1.9794538,
-                        57.2225558
+                        -5.6716266,
+                        57.8887166
                     ],
                     [
-                        -1.9794538,
-                        56.8760742
+                        -5.8347652,
+                        57.8856193
                     ],
                     [
-                        -2.1658979,
-                        56.8760742
+                        -5.8277052,
+                        57.5988958
                     ],
                     [
-                        -2.1658979,
-                        56.6333186
+                        -6.0384259,
+                        57.5986357
                     ],
                     [
-                        -2.3601106,
-                        56.6333186
+                        -6.0389115,
+                        57.6459559
                     ],
                     [
-                        -2.3601106,
-                        56.0477521
+                        -6.1981658,
+                        57.6456961
                     ],
                     [
-                        -1.9794538,
-                        56.0477521
+                        -6.2076123,
+                        57.7600132
                     ],
                     [
-                        -1.9794538,
-                        55.8650949
+                        -6.537067,
+                        57.7544033
                     ],
                     [
-                        -1.4745008,
-                        55.8650949
+                        -6.5312406,
+                        57.6402392
                     ],
                     [
-                        -1.4745008,
-                        55.2499926
+                        -6.7002056,
+                        57.6360809
                     ],
                     [
-                        -1.3221997,
-                        55.2499926
+                        -6.6807844,
+                        57.5236293
                     ],
                     [
-                        -1.3221997,
-                        54.8221737
+                        -6.8516915,
+                        57.5152857
                     ],
                     [
-                        -1.0550014,
-                        54.8221737
+                        -6.8361545,
+                        57.3385811
                     ],
                     [
-                        -1.0550014,
-                        54.6746628
+                        -6.6730158,
+                        57.3438213
                     ],
                     [
-                        -0.6618765,
-                        54.6746628
+                        -6.674958,
+                        57.2850883
                     ],
                     [
-                        -0.6618765,
-                        54.5527463
+                        -6.5098772,
+                        57.2850883
                     ],
                     [
-                        -0.3247617,
-                        54.5527463
+                        -6.4982244,
+                        57.1757637
                     ],
                     [
-                        -0.3247617,
-                        54.2865195
+                        -6.3506228,
+                        57.1820797
                     ],
                     [
-                        0.0092841,
-                        54.2865195
+                        -6.3312015,
+                        57.1251969
                     ],
                     [
-                        0.0092841,
-                        53.7938518
+                        -6.1797156,
+                        57.1230884
                     ],
                     [
-                        0.2081962,
-                        53.7938518
+                        -6.1719471,
+                        57.0682265
                     ],
                     [
-                        0.2081962,
-                        53.5217726
+                        -6.4593819,
+                        57.059779
                     ],
                     [
-                        0.4163548,
-                        53.5217726
+                        -6.4564687,
+                        57.1093806
                     ],
                     [
-                        0.4163548,
-                        53.0298851
+                        -6.6671895,
+                        57.1062165
                     ],
                     [
-                        1.4273388,
-                        53.0298851
+                        -6.6730158,
+                        57.002708
                     ],
                     [
-                        1.4273388,
-                        52.92021
+                        -6.5021087,
+                        57.0048233
                     ],
                     [
-                        1.8333912,
-                        52.92021
+                        -6.4836097,
+                        56.8917522
                     ],
                     [
-                        1.8333912,
-                        52.042488
+                        -6.3266104,
+                        56.8894062
                     ],
                     [
-                        1.5235504,
-                        52.042488
+                        -6.3156645,
+                        56.7799312
                     ],
                     [
-                        1.5235504,
-                        51.8261335
+                        -6.2146739,
+                        56.775675
                     ],
                     [
-                        1.2697049,
-                        51.8261335
+                        -6.2146739,
+                        56.7234965
                     ],
                     [
-                        1.2697049,
-                        51.6967453
+                        -6.6866107,
+                        56.7224309
                     ],
                     [
-                        1.116651,
-                        51.6967453
+                        -6.6769001,
+                        56.6114413
                     ],
                     [
-                        1.116651,
-                        51.440346
+                        -6.8419809,
+                        56.607166
                     ],
                     [
-                        1.5235504,
-                        51.440346
+                        -6.8400387,
+                        56.5483307
                     ],
                     [
-                        1.5235504,
-                        51.3331831
+                        -7.1546633,
+                        56.5461895
                     ],
                     [
-                        1.4507565,
-                        51.3331831
+                        -7.1488369,
+                        56.4872592
                     ],
                     [
-                        1.4507565,
-                        51.0207553
+                        -6.9915246,
+                        56.490476
                     ],
                     [
-                        1.0699883,
-                        51.0207553
+                        -6.9876404,
+                        56.4325329
                     ],
                     [
-                        1.0699883,
-                        50.9008416
+                        -6.6827265,
+                        56.4314591
                     ],
                     [
-                        0.7788126,
-                        50.9008416
+                        -6.6769001,
+                        56.5472601
                     ],
                     [
-                        0.7788126,
-                        50.729843
+                        -6.5292985,
+                        56.5504717
                     ],
                     [
-                        -0.7255952,
-                        50.729843
+                        -6.5234721,
+                        56.4379018
                     ],
                     [
-                        -0.7255952,
-                        50.7038437
+                        -6.3661598,
+                        56.4368281
                     ],
                     [
-                        -1.0074383,
-                        50.7038437
+                        -6.3642177,
+                        56.3766524
                     ],
                     [
-                        -1.0074383,
-                        50.5736307
+                        -6.5273563,
+                        56.3712749
                     ],
                     [
-                        -2.3625252,
-                        50.5736307
+                        -6.5171745,
+                        56.2428427
                     ],
                     [
-                        -2.3625252,
-                        50.4846421
+                        -6.4869621,
+                        56.247421
                     ],
                     [
-                        -2.4987805,
-                        50.4846421
+                        -6.4869621,
+                        56.1893882
                     ],
                     [
-                        -2.4987805,
-                        50.5736307
+                        -6.3001945,
+                        56.1985572
                     ],
                     [
-                        -3.4096378,
-                        50.5736307
+                        -6.3029411,
+                        56.2581017
                     ],
                     [
-                        -3.4096378,
-                        50.2057837
+                        -5.9019401,
+                        56.256576
                     ],
                     [
-                        -3.6922446,
-                        50.2057837
+                        -5.8964469,
+                        56.0960466
                     ],
                     [
-                        -3.6922446,
-                        50.1347737
+                        -6.0282829,
+                        56.0883855
                     ],
                     [
-                        -5.005468,
-                        50.1347737
+                        -6.0392692,
+                        56.1557502
                     ],
                     [
-                        -5.005468,
-                        49.9474456
+                        -6.3853385,
+                        56.1542205
                     ],
                     [
-                        -5.2839506,
-                        49.9474456
+                        -6.3606193,
+                        55.96099
                     ],
                     [
-                        -5.2839506,
-                        50.0229734
-                    ]
-                ],
-                [
-                    [
-                        -6.4580707,
-                        49.8673563
+                        -6.2123039,
+                        55.9640647
                     ],
                     [
-                        -6.4580707,
-                        49.9499935
+                        -6.2047508,
+                        55.9202269
                     ],
                     [
-                        -6.3978807,
-                        49.9499935
+                        -6.5185478,
+                        55.9129158
                     ],
                     [
-                        -6.3978807,
-                        50.0053797
+                        -6.5061881,
+                        55.7501763
                     ],
                     [
-                        -6.1799606,
-                        50.0053797
+                        -6.6764762,
+                        55.7409005
                     ],
                     [
-                        -6.1799606,
-                        49.9168614
+                        -6.6599967,
+                        55.6263176
                     ],
                     [
-                        -6.2540201,
-                        49.9168614
+                        -6.3551261,
+                        55.6232161
                     ],
                     [
-                        -6.2540201,
-                        49.8673563
-                    ]
-                ],
-                [
-                    [
-                        -5.8343165,
-                        49.932156
+                        -6.3578727,
+                        55.5689002
                     ],
                     [
-                        -5.8343165,
-                        49.9754641
+                        -6.0392692,
+                        55.5720059
                     ],
                     [
-                        -5.7683254,
-                        49.9754641
+                        -6.0310294,
+                        55.6247669
                     ],
                     [
-                        -5.7683254,
-                        49.932156
-                    ]
-                ],
-                [
-                    [
-                        -1.9483797,
-                        60.6885737
+                        -5.7398917,
+                        55.6309694
                     ],
                     [
-                        -1.9483797,
-                        60.3058841
+                        -5.7371452,
+                        55.4569279
                     ],
                     [
-                        -1.7543149,
-                        60.3058841
+                        -5.8964469,
+                        55.4600426
                     ],
                     [
-                        -1.7543149,
-                        60.1284428
+                        -5.8964469,
+                        55.2789864
                     ],
                     [
-                        -1.5754914,
-                        60.1284428
+                        -5.4350211,
+                        55.2821151
                     ],
                     [
-                        -1.5754914,
-                        59.797917
+                        -5.4405143,
+                        55.4506979
                     ],
                     [
-                        -1.0316959,
-                        59.797917
+                        -5.2867057,
+                        55.4569279
                     ],
                     [
-                        -1.0316959,
-                        60.0354518
+                        -5.3086784,
+                        55.4070602
                     ],
                     [
-                        -0.6626918,
-                        60.0354518
+                        -4.9735954,
+                        55.4008223
                     ],
                     [
-                        -0.6626918,
-                        60.9103862
+                        -4.9845817,
+                        55.2038242
                     ],
                     [
-                        -1.1034395,
-                        60.9103862
+                        -5.1493766,
+                        55.2038242
                     ],
                     [
-                        -1.1034395,
-                        60.8040022
+                        -5.1411369,
+                        55.037337
                     ],
                     [
-                        -1.3506319,
-                        60.8040022
-                    ],
-                    [
-                        -1.3506319,
-                        60.6885737
+                        -5.2152946,
+                        55.0341891
                     ]
                 ],
                 [
                     [
-                        -2.203381,
-                        60.1968568
+                        -2.1646559,
+                        60.1622059
                     ],
                     [
-                        -2.203381,
-                        60.0929443
+                        -1.9930299,
+                        60.1609801
                     ],
                     [
-                        -1.9864011,
-                        60.0929443
+                        -1.9946862,
+                        60.1035151
                     ],
                     [
-                        -1.9864011,
-                        60.1968568
+                        -2.1663122,
+                        60.104743
                     ]
                 ],
                 [
                     [
-                        -1.7543149,
-                        59.5698289
+                        -1.5360658,
+                        59.8570831
                     ],
                     [
-                        -1.7543149,
-                        59.4639383
+                        -1.3653566,
+                        59.8559841
                     ],
                     [
-                        -1.5373349,
-                        59.4639383
+                        -1.366847,
+                        59.7975565
                     ],
                     [
-                        -1.5373349,
-                        59.5698289
-                    ]
-                ],
-                [
+                        -1.190628,
+                        59.7964199
+                    ],
                     [
-                        -4.5585981,
-                        59.1370518
+                        -1.1862046,
+                        59.9695391
                     ],
                     [
-                        -4.5585981,
-                        58.9569099
+                        -1.0078652,
+                        59.9683948
                     ],
                     [
-                        -4.2867004,
-                        58.9569099
+                        -1.0041233,
+                        60.114145
                     ],
                     [
-                        -4.2867004,
-                        59.1370518
-                    ]
-                ],
-                [
+                        -0.8360832,
+                        60.1130715
+                    ],
                     [
-                        -6.2787732,
-                        59.2025744
+                        -0.834574,
+                        60.1716772
                     ],
                     [
-                        -6.2787732,
-                        59.0227769
+                        -1.0074262,
+                        60.1727795
                     ],
                     [
-                        -5.6650612,
-                        59.0227769
+                        -1.0052165,
+                        60.2583924
                     ],
                     [
-                        -5.6650612,
-                        59.2025744
-                    ]
-                ],
-                [
+                        -0.8299659,
+                        60.2572778
+                    ],
                     [
-                        -8.7163482,
-                        57.9440556
+                        -0.826979,
+                        60.3726551
                     ],
                     [
-                        -8.7163482,
-                        57.7305936
+                        -0.6507514,
+                        60.3715381
                     ],
                     [
-                        -8.3592926,
-                        57.7305936
+                        -0.6477198,
+                        60.4882292
                     ],
                     [
-                        -8.3592926,
-                        57.9440556
-                    ]
-                ],
-                [
+                        -0.9984896,
+                        60.4904445
+                    ],
                     [
-                        -7.6077005,
-                        50.4021026
+                        -0.9970279,
+                        60.546555
                     ],
                     [
-                        -7.6077005,
-                        50.2688657
+                        -0.6425288,
+                        60.5443201
                     ],
                     [
-                        -7.3907205,
-                        50.2688657
+                        -0.6394896,
+                        60.6606792
                     ],
                     [
-                        -7.3907205,
-                        50.4021026
-                    ]
-                ],
-                [
+                        -0.8148133,
+                        60.6617806
+                    ],
                     [
-                        -7.7304303,
-                        58.3579902
+                        -0.8132987,
+                        60.7196112
                     ],
                     [
-                        -7.7304303,
-                        58.248313
+                        -0.6383298,
+                        60.7185141
                     ],
                     [
-                        -7.5134503,
-                        58.248313
+                        -0.635467,
+                        60.8275393
                     ],
                     [
-                        -7.5134503,
-                        58.3579902
-                    ]
-                ]
-            ]
-        },
-        {
-            "name": "OS Scottish Popular historic",
-            "type": "tms",
-            "template": "http://ooc.openstreetmap.org/npescotland/tiles/{zoom}/{x}/{y}.jpg",
-            "scaleExtent": [
-                6,
-                15
-            ],
-            "polygon": [
-                [
+                        -0.797568,
+                        60.8285523
+                    ],
                     [
-                        -7.8,
-                        54.5
+                        -0.9941426,
+                        60.8297807
                     ],
                     [
-                        -7.8,
-                        61.1
+                        -0.9954966,
+                        60.7782667
                     ],
                     [
-                        -1.1,
-                        61.1
+                        -1.1670282,
+                        60.7793403
                     ],
                     [
-                        -1.1,
-                        54.5
+                        -1.1700357,
+                        60.6646181
                     ],
                     [
-                        -7.8,
-                        54.5
-                    ]
-                ]
-            ]
-        },
-        {
-            "name": "OS Town Plans, Aberdeen 1866-1867 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/aberdeen/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -1.5222599,
+                        60.6668304
+                    ],
                     [
-                        -2.14039404,
-                        57.11218789
+                        -1.5237866,
+                        60.6084426
                     ],
                     [
-                        -2.14064752,
-                        57.17894161
+                        -1.6975673,
+                        60.609536
                     ],
                     [
-                        -2.04501987,
-                        57.17901252
+                        -1.7021271,
+                        60.4345249
                     ],
                     [
-                        -2.04493842,
-                        57.11225862
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/aberdeen.html",
-            "terms_text": "National Library of Scotland - Aberdeen 1866-1867"
-        },
-        {
-            "name": "OS Town Plans, Airdrie 1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/airdrie/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -1.5260578,
+                        60.4334111
+                    ],
                     [
-                        -3.99291738,
-                        55.86408041
+                        -1.5275203,
+                        60.3770719
                     ],
                     [
-                        -3.99338933,
-                        55.87329115
+                        -1.8751127,
+                        60.3792746
                     ],
                     [
-                        -3.9691085,
-                        55.87368212
+                        -1.8781372,
+                        60.2624647
                     ],
                     [
-                        -3.9686423,
-                        55.86447124
+                        -1.7019645,
+                        60.2613443
+                    ],
+                    [
+                        -1.7049134,
+                        60.1470532
+                    ],
+                    [
+                        -1.528659,
+                        60.1459283
                     ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/airdrie.html",
-            "terms_text": "National Library of Scotland - Airdrie 1858"
-        },
-        {
-            "name": "OS Town Plans, Alexandria 1859 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Alexandria 1859, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/alexandria/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
+                ],
                 [
                     [
-                        -4.58973571,
-                        55.97536707
+                        -0.9847667,
+                        60.8943762
                     ],
                     [
-                        -4.59104461,
-                        55.99493153
+                        -0.9860347,
+                        60.8361105
                     ],
                     [
-                        -4.55985072,
-                        55.99558348
+                        -0.8078362,
+                        60.8351904
                     ],
                     [
-                        -4.55855754,
-                        55.97601855
+                        -0.8065683,
+                        60.8934578
                     ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/alexandria.html",
-            "terms_text": "National Library of Scotland - Alexandria 1859"
-        },
-        {
-            "name": "OS Town Plans, Alloa 1861-1862 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Alloa 1861-1862, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/alloa/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
+                ],
                 [
                     [
-                        -3.81166061,
-                        56.09864363
+                        -7.7696901,
+                        56.8788231
                     ],
                     [
-                        -3.81274448,
-                        56.12169929
+                        -7.7614504,
+                        56.7608274
                     ],
                     [
-                        -3.7804609,
-                        56.12216898
+                        -7.6009049,
+                        56.7641903
                     ],
                     [
-                        -3.77939631,
-                        56.09911292
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/alloa.html",
-            "terms_text": "National Library of Scotland - Alloa 1861-1862"
-        },
-        {
-            "name": "OS Town Plans, Annan 1859 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Annan 1859, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/annan/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -7.5972473,
+                        56.819332
+                    ],
                     [
-                        -3.27921439,
-                        54.98252155
+                        -7.4479894,
+                        56.8203948
                     ],
                     [
-                        -3.27960062,
-                        54.9946601
+                        -7.4489319,
+                        56.8794098
                     ],
                     [
-                        -3.24866331,
-                        54.99498165
+                        -7.2841369,
+                        56.8794098
                     ],
                     [
-                        -3.24828642,
-                        54.98284297
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/annan.html",
-            "terms_text": "National Library of Scotland - Annan 1859"
-        },
-        {
-            "name": "OS Town Plans, Arbroath 1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Arbroath 1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/arbroath/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -7.2813904,
+                        57.0471152
+                    ],
                     [
-                        -2.60716469,
-                        56.53995105
+                        -7.1303283,
+                        57.0515969
                     ],
                     [
-                        -2.60764981,
-                        56.57022426
+                        -7.1330749,
+                        57.511801
                     ],
                     [
-                        -2.56498708,
-                        56.57042549
+                        -6.96828,
+                        57.5147514
                     ],
                     [
-                        -2.564536,
-                        56.54015206
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/arbroath.html",
-            "terms_text": "National Library of Scotland - Arbroath 1858"
-        },
-        {
-            "name": "OS Town Plans, Ayr 1855 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Ayr 1855, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/ayr/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -6.9765198,
+                        57.6854668
+                    ],
                     [
-                        -4.66768105,
-                        55.43748864
+                        -6.8062317,
+                        57.6913392
                     ],
                     [
-                        -4.67080057,
-                        55.48363961
+                        -6.8089782,
+                        57.8041985
                     ],
                     [
-                        -4.60609844,
-                        55.48503484
+                        -6.6496765,
+                        57.8071252
                     ],
                     [
-                        -4.60305426,
-                        55.43888149
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/ayr.html",
-            "terms_text": "National Library of Scotland - Ayr 1855"
-        },
-        {
-            "name": "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/berwick/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -6.6441833,
+                        57.8612267
+                    ],
                     [
-                        -2.02117487,
-                        55.75577627
+                        -6.3200866,
+                        57.8626878
                     ],
                     [
-                        -2.02118763,
-                        55.77904118
+                        -6.3200866,
+                        58.1551617
                     ],
                     [
-                        -1.98976956,
-                        55.77904265
+                        -6.1607849,
+                        58.1522633
                     ],
                     [
-                        -1.9897755,
-                        55.75577774
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/berwick.html",
-            "terms_text": "National Library of Scotland - Berwick-upon-Tweed 1852"
-        },
-        {
-            "name": "OS Town Plans, Brechin 1862 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Brechin 1862, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/brechin/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -6.1552917,
+                        58.20874
+                    ],
                     [
-                        -2.67480248,
-                        56.71456775
+                        -5.9850036,
+                        58.2101869
                     ],
                     [
-                        -2.67521172,
-                        56.73739937
+                        -5.9904968,
+                        58.2680163
                     ],
                     [
-                        -2.64319679,
-                        56.73756872
+                        -6.1497986,
+                        58.2665717
                     ],
                     [
-                        -2.64280695,
-                        56.71473694
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/brechin.html",
-            "terms_text": "National Library of Scotland - Brechin 1862"
-        },
-        {
-            "name": "OS Town Plans, Burntisland 1894 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Burntisland 1894, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/burntisland/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -6.1415588,
+                        58.5557514
+                    ],
                     [
-                        -3.24879624,
-                        56.04240046
+                        -6.3173401,
+                        58.5557514
                     ],
                     [
-                        -3.2495182,
-                        56.06472996
+                        -6.3091003,
+                        58.4983923
                     ],
                     [
-                        -3.21830572,
-                        56.06504207
+                        -6.4876282,
+                        58.4955218
                     ],
                     [
-                        -3.21760179,
-                        56.0427123
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/burntisland.html",
-            "terms_text": "National Library of Scotland - Burntisland 1894"
-        },
-        {
-            "name": "OS Town Plans, Campbelton 1865 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Campbelton 1865, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/campbeltown/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -6.4876282,
+                        58.4423768
+                    ],
                     [
-                        -5.62345307,
-                        55.40255998
+                        -6.6606628,
+                        58.4395018
                     ],
                     [
-                        -5.62631353,
-                        55.43375303
+                        -6.6469299,
+                        58.3819525
                     ],
                     [
-                        -5.58276654,
-                        55.43503753
+                        -6.8117248,
+                        58.3805125
                     ],
                     [
-                        -5.57994024,
-                        55.40384299
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/campbelton.html",
-            "terms_text": "National Library of Scotland - Campbelton 1865"
-        },
-        {
-            "name": "OS Town Plans, Coatbridge 1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Coatbridge 1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/coatbridge/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -6.8117248,
+                        58.3286357
+                    ],
                     [
-                        -4.05035921,
-                        55.84648689
+                        -6.9792663,
+                        58.3286357
                     ],
                     [
-                        -4.05157062,
-                        55.86947193
+                        -6.9710266,
+                        58.2694608
                     ],
                     [
-                        -4.01953905,
-                        55.87000186
+                        -7.1413147,
+                        58.2680163
                     ],
                     [
-                        -4.01834651,
-                        55.84701638
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/coatbridge.html",
-            "terms_text": "National Library of Scotland - Coatbridge 1858"
-        },
-        {
-            "name": "OS Town Plans, Cupar 1854 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Cupar 1854, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/cupar1854/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -7.1403816,
+                        58.0358742
+                    ],
                     [
-                        -3.04765872,
-                        56.28653177
+                        -7.3020636,
+                        58.0351031
                     ],
                     [
-                        -3.04890965,
-                        56.332192
+                        -7.3030347,
+                        57.9774797
                     ],
                     [
-                        -2.98498515,
-                        56.33271677
+                        -7.1379539,
+                        57.9777372
                     ],
                     [
-                        -2.98381041,
-                        56.28705563
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/cupar_1.html",
-            "terms_text": "National Library of Scotland - Cupar 1854"
-        },
-        {
-            "name": "OS Town Plans, Cupar 1893-1894 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Cupar 1893-1894, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/cupar1893/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -7.1413526,
+                        57.9202792
+                    ],
                     [
-                        -3.0327697,
-                        56.30243657
+                        -7.1398961,
+                        57.8640206
                     ],
                     [
-                        -3.03338443,
-                        56.32520139
+                        -7.3020636,
+                        57.862471
                     ],
                     [
-                        -3.00146629,
-                        56.32546356
+                        -7.298484,
+                        57.7442293
                     ],
                     [
-                        -3.00087054,
-                        56.30269852
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/cupar_2.html",
-            "terms_text": "National Library of Scotland - Cupar 1893-1894"
-        },
-        {
-            "name": "OS Town Plans, Dalkeith 1852 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Dalkeith 1852, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/dalkeith1852/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -7.4509193,
+                        57.7456951
+                    ],
                     [
-                        -3.07862465,
-                        55.88900264
+                        -7.4550392,
+                        57.6899522
                     ],
                     [
-                        -3.0790381,
-                        55.90389729
+                        -7.6186131,
+                        57.6906048
                     ],
                     [
-                        -3.05835611,
-                        55.90407681
+                        -7.6198341,
+                        57.7456951
                     ],
                     [
-                        -3.05795059,
-                        55.88918206
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/dalkeith_1.html",
-            "terms_text": "National Library of Scotland - Dalkeith 1852"
-        },
-        {
-            "name": "OS Town Plans, Dalkeith 1893 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Dalkeith 1893, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/dalkeith1893/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -7.7901222,
+                        57.7442293
+                    ],
                     [
-                        -3.08600192,
-                        55.87936087
+                        -7.7873756,
+                        57.6855477
                     ],
                     [
-                        -3.08658588,
-                        55.90025926
+                        -7.6222332,
+                        57.6853817
                     ],
                     [
-                        -3.0436473,
-                        55.90063074
+                        -7.6173779,
+                        57.5712602
                     ],
                     [
-                        -3.04308639,
-                        55.87973206
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/dalkeith_2.html",
-            "terms_text": "National Library of Scotland - Dalkeith 1893"
-        },
-        {
-            "name": "OS Town Plans, Dumbarton 1859 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Dumbarton 1859, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/dumbarton/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -7.788285,
+                        57.5709998
+                    ],
                     [
-                        -4.58559982,
-                        55.92742578
+                        -7.7892561,
+                        57.512109
                     ],
                     [
-                        -4.58714245,
-                        55.95056014
+                        -7.7038025,
+                        57.5115874
                     ],
                     [
-                        -4.55463269,
-                        55.95123882
+                        -7.6999183,
+                        57.4546902
                     ],
                     [
-                        -4.55310939,
-                        55.92810387
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/dumbarton.html",
-            "terms_text": "National Library of Scotland - Dumbarton 1859"
-        },
-        {
-            "name": "OS Town Plans, Dumfries 1850 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Dumfries 1850, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/dumfries1850/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -7.5367796,
+                        57.4552126
+                    ],
                     [
-                        -3.63928076,
-                        55.03715991
+                        -7.5348375,
+                        57.5126306
                     ],
                     [
-                        -3.64116352,
-                        55.08319002
+                        -7.4581235,
+                        57.5131521
                     ],
                     [
-                        -3.57823183,
-                        55.08402202
+                        -7.4552103,
+                        57.2824165
                     ],
                     [
-                        -3.57642118,
-                        55.0379905
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/dumfries_1.html",
-            "terms_text": "National Library of Scotland - Dumfries 1850"
-        },
-        {
-            "name": "OS Town Plans, Dumfries 1893 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Dumfries 1893, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/dumfries1893/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -7.6115515,
+                        57.2845158
+                    ],
                     [
-                        -3.63179081,
-                        55.04150111
+                        -7.6144647,
+                        57.2272651
                     ],
                     [
-                        -3.63330662,
-                        55.07873429
+                        -7.451326,
+                        57.2256881
                     ],
                     [
-                        -3.58259012,
-                        55.07940411
+                        -7.451326,
+                        57.1103873
                     ],
                     [
-                        -3.58112132,
-                        55.04217001
+                        -7.6164068,
+                        57.1088053
+                    ],
+                    [
+                        -7.603783,
+                        56.8792358
                     ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/dumfries_2.html",
-            "terms_text": "National Library of Scotland - Dumfries 1893"
-        },
-        {
-            "name": "OS Town Plans, Dundee 1857-1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Dundee 1857-1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/dundee1857/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
+                ],
                 [
                     [
-                        -3.02584468,
-                        56.44879161
+                        -1.7106618,
+                        59.5626284
                     ],
                     [
-                        -3.02656969,
-                        56.47566815
+                        -1.5417509,
+                        59.562215
                     ],
                     [
-                        -2.94710317,
-                        56.47629984
+                        -1.5423082,
+                        59.5037224
                     ],
                     [
-                        -2.94643424,
-                        56.44942266
+                        -1.7112191,
+                        59.5041365
                     ]
                 ]
             ],
-            "terms_url": "http://maps.nls.uk/townplans/dundee_1.html",
-            "terms_text": "National Library of Scotland - Dundee 1857-1858"
+            "terms_url": "http://geo.nls.uk/maps/",
+            "terms_text": "National Library of Scotland Historic Maps"
         },
         {
-            "name": "OS Town Plans, Dundee 1870-1872 (NLS)",
+            "name": "New & Misaligned TIGER Roads",
             "type": "tms",
-            "description": "Detailed town plan of Dundee 1870-1872, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/dundee1870/{zoom}/{x}/{-y}.png",
+            "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap",
+            "template": "http://{switch:a,b,c}.tiles.mapbox.com/v4/enf.e0b8291e/{zoom}/{x}/{y}.png?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJhNVlHd29ZIn0.ti6wATGDWOmCnCYen-Ip7Q",
             "scaleExtent": [
-                13,
-                20
+                0,
+                22
             ],
             "polygon": [
                 [
                     [
-                        -3.03399945,
-                        56.448497
+                        -124.7617886,
+                        48.4130148
                     ],
                     [
-                        -3.03497463,
-                        56.48435238
+                        -124.6059492,
+                        45.90245
                     ],
                     [
-                        -2.92352705,
-                        56.48523137
+                        -124.9934269,
+                        40.0557614
                     ],
                     [
-                        -2.92265681,
-                        56.4493748
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/dundee_2.html",
-            "terms_text": "National Library of Scotland - Dundee 1870-1872"
-        },
-        {
-            "name": "OS Town Plans, Dunfermline 1854 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Dunfermline 1854, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/dunfermline1854/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -122.5369737,
+                        36.8566086
+                    ],
                     [
-                        -3.49045481,
-                        56.0605979
+                        -119.9775867,
+                        33.0064099
                     ],
                     [
-                        -3.49116489,
-                        56.07898822
+                        -117.675935,
+                        32.4630223
                     ],
                     [
-                        -3.44374075,
-                        56.07955208
+                        -114.8612307,
+                        32.4799891
                     ],
                     [
-                        -3.44305323,
-                        56.06116138
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/dunfermline_1.html",
-            "terms_text": "National Library of Scotland - Dunfermline 1854"
-        },
-        {
-            "name": "OS Town Plans, Dunfermline 1894 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Dunfermline 1894, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/dunfermline1893/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -111.0089311,
+                        31.336015
+                    ],
                     [
-                        -3.48284159,
-                        56.05198219
+                        -108.1992687,
+                        31.3260016
                     ],
                     [
-                        -3.48399434,
-                        56.08198924
+                        -108.1871123,
+                        31.7755116
                     ],
                     [
-                        -3.44209721,
-                        56.08248587
+                        -106.5307225,
+                        31.7820947
                     ],
                     [
-                        -3.44097697,
-                        56.05247826
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/dunfermline_2.html",
-            "terms_text": "National Library of Scotland - Dunfermline 1894"
-        },
-        {
-            "name": "OS Town Plans, Edinburgh 1849-1851 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/edinburgh1849/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -106.4842052,
+                        31.7464455
+                    ],
                     [
-                        -3.2361048,
-                        55.921366
+                        -106.429317,
+                        31.7520583
                     ],
                     [
-                        -3.23836397,
-                        55.99217223
+                        -106.2868855,
+                        31.5613291
                     ],
                     [
-                        -3.14197035,
-                        55.99310288
+                        -106.205248,
+                        31.446704
                     ],
                     [
-                        -3.13988689,
-                        55.92229419
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/edinburgh1056_1.html",
-            "terms_text": "National Library of Scotland - Edinburgh 1849-1851"
-        },
-        {
-            "name": "OS Town Plans, Edinburgh 1876-1877 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/edinburgh1876/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -105.0205259,
+                        30.5360988
+                    ],
                     [
-                        -3.24740498,
-                        55.92116518
+                        -104.5881916,
+                        29.6997856
                     ],
                     [
-                        -3.24989581,
-                        55.99850896
+                        -103.2518856,
+                        28.8908685
                     ],
                     [
-                        -3.13061127,
-                        55.99966059
+                        -102.7173632,
+                        29.3920567
                     ],
                     [
-                        -3.12835798,
-                        55.92231348
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/edinburgh1056_2.html",
-            "terms_text": "National Library of Scotland - Edinburgh 1876-1877"
-        },
-        {
-            "name": "OS Town Plans, Edinburgh 1893-1894 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/edinburgh1893/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -102.1513983,
+                        29.7475702
+                    ],
                     [
-                        -3.26111081,
-                        55.89555387
+                        -101.2552871,
+                        29.4810523
                     ],
                     [
-                        -3.26450423,
-                        55.9997912
+                        -100.0062436,
+                        28.0082173
                     ],
                     [
-                        -3.11970824,
-                        56.00119128
+                        -99.2351068,
+                        26.4475962
                     ],
                     [
-                        -3.1167031,
-                        55.89694851
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/edinburgh500.html",
-            "terms_text": "National Library of Scotland - Edinburgh 1893-1894"
-        },
-        {
-            "name": "OS Town Plans, Elgin 1868 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Elgin 1868, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/elgin/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -98.0109067,
+                        25.9928035
+                    ],
                     [
-                        -3.33665196,
-                        57.62879017
+                        -97.435024,
+                        25.8266009
                     ],
                     [
-                        -3.33776583,
-                        57.65907381
+                        -96.9555259,
+                        25.9821589
                     ],
                     [
-                        -3.29380859,
-                        57.65953111
+                        -96.8061741,
+                        27.7978168
                     ],
                     [
-                        -3.29273129,
-                        57.62924695
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/elgin.html",
-            "terms_text": "National Library of Scotland - Elgin 1868"
-        },
-        {
-            "name": "OS Town Plans, Falkirk 1858-1859 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Falkirk 1858-1859, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/falkirk/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -95.5563349,
+                        28.5876066
+                    ],
                     [
-                        -3.79587441,
-                        55.99343101
+                        -93.7405308,
+                        29.4742093
                     ],
                     [
-                        -3.79697783,
-                        56.01720281
+                        -90.9028456,
+                        28.8564513
                     ],
                     [
-                        -3.76648151,
-                        56.01764348
+                        -88.0156706,
+                        28.9944338
                     ],
                     [
-                        -3.76539679,
-                        55.99387129
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/falkirk.html",
-            "terms_text": "National Library of Scotland - Falkirk 1858-1859"
-        },
-        {
-            "name": "OS Town Plans, Forfar 1860-1861 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Forfar 1860-1861, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/forfar/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -88.0162494,
+                        30.0038862
+                    ],
                     [
-                        -2.90326183,
-                        56.6289471
+                        -86.0277506,
+                        30.0047454
                     ],
                     [
-                        -2.90378797,
-                        56.65095013
+                        -84.0187909,
+                        28.9961781
                     ],
                     [
-                        -2.87228457,
-                        56.65117489
+                        -81.9971976,
+                        25.9826768
                     ],
                     [
-                        -2.87177676,
-                        56.62917168
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/forfar.html",
-            "terms_text": "National Library of Scotland - Forfar 1860-1861"
-        },
-        {
-            "name": "OS Town Plans, Forres 1868 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Forres 1868, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/forres/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -81.9966618,
+                        25.0134917
+                    ],
                     [
-                        -3.63516795,
-                        57.58887872
+                        -84.0165592,
+                        25.0125783
                     ],
                     [
-                        -3.63647637,
-                        57.618002
+                        -84.0160068,
+                        24.0052745
                     ],
                     [
-                        -3.57751453,
-                        57.61875171
+                        -80.0199985,
+                        24.007096
                     ],
                     [
-                        -3.5762532,
-                        57.58962759
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/forres.html",
-            "terms_text": "National Library of Scotland - Forres 1868"
-        },
-        {
-            "name": "OS Town Plans, Galashiels 1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Galashiels 1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/galashiels/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -79.8901116,
+                        26.8550713
+                    ],
                     [
-                        -2.82918609,
-                        55.59586303
+                        -80.0245309,
+                        32.0161282
                     ],
                     [
-                        -2.82981273,
-                        55.62554026
+                        -75.4147385,
+                        35.0531894
                     ],
                     [
-                        -2.78895254,
-                        55.62580992
+                        -74.0211163,
+                        39.5727927
                     ],
                     [
-                        -2.78835674,
-                        55.59613239
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/galashiels.html",
-            "terms_text": "National Library of Scotland - Galashiels 1858"
-        },
-        {
-            "name": "OS Town Plans, Girvan 1857 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Girvan 1857, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/girvan/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -72.002019,
+                        40.9912464
+                    ],
                     [
-                        -4.87424251,
-                        55.22679729
+                        -69.8797398,
+                        40.9920457
                     ],
                     [
-                        -4.87587895,
-                        55.24945946
+                        -69.8489304,
+                        43.2619916
                     ],
                     [
-                        -4.84447382,
-                        55.25019598
+                        -66.9452845,
+                        44.7104937
                     ],
                     [
-                        -4.84285519,
-                        55.22753318
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/girvan.html",
-            "terms_text": "National Library of Scotland - Girvan 1857"
-        },
-        {
-            "name": "OS Town Plans, Glasgow 1857-1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Glasgow 1857-1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/glasgow1857/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -67.7596632,
+                        47.0990024
+                    ],
                     [
-                        -4.31575491,
-                        55.82072009
+                        -69.2505131,
+                        47.5122328
                     ],
                     [
-                        -4.319683,
-                        55.88667625
+                        -70.4614886,
+                        46.2176574
                     ],
                     [
-                        -4.1771319,
-                        55.88928081
+                        -71.412273,
+                        45.254878
                     ],
                     [
-                        -4.1734447,
-                        55.82331825
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/glasgow_1.html",
-            "terms_text": "National Library of Scotland - Glasgow 1857-1858"
-        },
-        {
-            "name": "OS Town Plans, Glasgow 1892-1894 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Glasgow 1892-1894, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/glasgow1894/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -72.0222508,
+                        45.0059846
+                    ],
                     [
-                        -4.3465357,
-                        55.81456228
+                        -75.0798841,
+                        44.9802854
                     ],
                     [
-                        -4.35157646,
-                        55.89806268
+                        -76.9023061,
+                        43.8024568
                     ],
                     [
-                        -4.17788765,
-                        55.9012587
+                        -78.7623935,
+                        43.6249578
                     ],
                     [
-                        -4.17321842,
-                        55.81774834
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/glasgow_2.html",
-            "terms_text": "National Library of Scotland - Glasgow 1892-1894"
-        },
-        {
-            "name": "OS Town Plans, Greenock 1857 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Greenock 1857, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/greenock/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -79.15798,
+                        43.4462589
+                    ],
                     [
-                        -4.78108857,
-                        55.92617865
+                        -79.0060087,
+                        42.8005317
                     ],
                     [
-                        -4.78382957,
-                        55.96437481
+                        -82.662475,
+                        41.6889458
                     ],
                     [
-                        -4.7302257,
-                        55.96557475
+                        -82.1761642,
+                        43.588535
                     ],
                     [
-                        -4.72753731,
-                        55.92737687
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/greenock.html",
-            "terms_text": "National Library of Scotland - Greenock 1857"
-        },
-        {
-            "name": "OS Town Plans, Haddington 1853 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Haddington 1853, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/haddington1853/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -83.2813977,
+                        46.138853
+                    ],
                     [
-                        -2.78855542,
-                        55.9451862
+                        -87.5064535,
+                        48.0142702
                     ],
                     [
-                        -2.78888196,
-                        55.96124194
+                        -88.3492194,
+                        48.2963271
                     ],
                     [
-                        -2.76674325,
-                        55.9613817
+                        -89.4353148,
+                        47.9837822
                     ],
                     [
-                        -2.76642588,
-                        55.94532587
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/haddington_1.html",
-            "terms_text": "National Library of Scotland - Haddington 1853"
-        },
-        {
-            "name": "OS Town Plans, Haddington 1893 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Haddington 1893, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/haddington1893/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -93.9981078,
+                        49.0067142
+                    ],
                     [
-                        -2.80152293,
-                        55.93428734
+                        -95.1105379,
+                        49.412004
                     ],
                     [
-                        -2.80214693,
-                        55.96447189
+                        -96.0131199,
+                        49.0060547
                     ],
                     [
-                        -2.76038069,
-                        55.9647367
+                        -123.3228926,
+                        49.0042878
                     ],
                     [
-                        -2.75978916,
-                        55.93455185
+                        -123.2275233,
+                        48.1849927
                     ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/haddington_2.html",
-            "terms_text": "National Library of Scotland - Haddington 1893"
-        },
-        {
-            "name": "OS Town Plans, Hamilton 1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Hamilton 1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/hamilton/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
+                ],
                 [
                     [
-                        -4.06721642,
-                        55.74877265
+                        -160.5787616,
+                        22.5062947
                     ],
                     [
-                        -4.06924047,
-                        55.78698508
+                        -160.5782192,
+                        21.4984647
                     ],
                     [
-                        -4.01679233,
-                        55.78785698
+                        -158.7470604,
+                        21.2439843
                     ],
                     [
-                        -4.01481949,
-                        55.74964331
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/hamilton.html",
-            "terms_text": "National Library of Scotland - Hamilton 1858"
-        },
-        {
-            "name": "OS Town Plans, Hawick 1857-1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Hawick 1857-1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/hawick/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -157.5083185,
+                        20.995803
+                    ],
                     [
-                        -2.80130149,
-                        55.4102516
+                        -155.9961942,
+                        18.7790194
                     ],
                     [
-                        -2.80176329,
-                        55.43304638
+                        -154.6217803,
+                        18.7586966
                     ],
                     [
-                        -2.7708832,
-                        55.43324489
+                        -154.6890176,
+                        19.8805722
                     ],
                     [
-                        -2.77043917,
-                        55.41044995
+                        -156.2927622,
+                        21.2225888
+                    ],
+                    [
+                        -157.5047384,
+                        21.9984962
+                    ],
+                    [
+                        -159.0093692,
+                        22.5070181
                     ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/hawick.html",
-            "terms_text": "National Library of Scotland - Hawick 1857-1858"
-        },
-        {
-            "name": "OS Town Plans, Inverness 1867-1868 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Inverness 1867-1868, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/inverness/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
+                ],
                 [
                     [
-                        -4.25481758,
-                        57.45916363
+                        -167.1571546,
+                        68.721974
                     ],
                     [
-                        -4.25752308,
-                        57.50302387
+                        -164.8553982,
+                        67.0255078
                     ],
                     [
-                        -4.19713638,
-                        57.50409032
+                        -168.002195,
+                        66.0017503
                     ],
                     [
-                        -4.1945031,
-                        57.46022829
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/inverness.html",
-            "terms_text": "National Library of Scotland - Inverness 1867-1868"
-        },
-        {
-            "name": "OS Town Plans, Irvine 1859 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Irvine 1859, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/irvine/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -169.0087448,
+                        66.001546
+                    ],
                     [
-                        -4.67540402,
-                        55.60649957
+                        -169.0075381,
+                        64.9987675
                     ],
                     [
-                        -4.67643252,
-                        55.62159024
+                        -172.5143281,
+                        63.8767267
                     ],
                     [
-                        -4.65537888,
-                        55.62204812
+                        -173.8197023,
+                        59.74014
                     ],
                     [
-                        -4.65435844,
-                        55.60695719
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/irvine.html",
-            "terms_text": "National Library of Scotland - Irvine 1859"
-        },
-        {
-            "name": "OS Town Plans, Jedburgh 1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Jedburgh 1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/jedburgh/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -162.5018149,
+                        58.0005815
+                    ],
                     [
-                        -2.56332521,
-                        55.47105448
+                        -160.0159024,
+                        58.0012389
                     ],
                     [
-                        -2.56355503,
-                        55.48715562
+                        -160.0149725,
+                        57.000035
                     ],
                     [
-                        -2.54168193,
-                        55.48725438
+                        -160.5054788,
+                        56.9999017
                     ],
                     [
-                        -2.54146103,
-                        55.47115318
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/jedburgh.html",
-            "terms_text": "National Library of Scotland - Jedburgh 1858"
-        },
-        {
-            "name": "OS Town Plans, Kelso 1857 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Kelso 1857, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/kelso/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -165.8092575,
+                        54.824847
+                    ],
                     [
-                        -2.44924544,
-                        55.58390848
+                        -178.000097,
+                        52.2446469
                     ],
                     [
-                        -2.44949757,
-                        55.6059582
+                        -177.9992996,
+                        51.2554252
                     ],
                     [
-                        -2.41902085,
-                        55.60606617
+                        -171.4689067,
+                        51.8215329
                     ],
                     [
-                        -2.41878581,
-                        55.58401636
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/kelso.html",
-            "terms_text": "National Library of Scotland - Kelso 1857"
-        },
-        {
-            "name": "OS Town Plans, Kilmarnock 1857-1859 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/kilmarnock/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -162.40251,
+                        53.956664
+                    ],
                     [
-                        -4.51746876,
-                        55.58950933
+                        -159.0075717,
+                        55.002502
                     ],
                     [
-                        -4.5194347,
-                        55.62017114
+                        -158.0190709,
+                        55.0027849
                     ],
                     [
-                        -4.47675652,
-                        55.62104083
+                        -151.9963213,
+                        55.9991902
                     ],
                     [
-                        -4.4748238,
-                        55.59037802
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/kilmarnock.html",
-            "terms_text": "National Library of Scotland - Kilmarnock 1857-1859"
-        },
-        {
-            "name": "OS Town Plans, Kirkcaldy 1855 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Kirkcaldy 1855, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/kirkcaldy1855/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -151.500341,
+                        57.9987853
+                    ],
                     [
-                        -3.17455285,
-                        56.09518942
+                        -151.5012894,
+                        58.9919816
                     ],
                     [
-                        -3.17554995,
-                        56.12790251
+                        -138.5159989,
+                        58.9953194
                     ],
                     [
-                        -3.12991402,
-                        56.12832843
+                        -138.5150471,
+                        57.9986434
                     ],
                     [
-                        -3.12895559,
-                        56.09561481
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/kirkcaldy_1.html",
-            "terms_text": "National Library of Scotland - Kirkcaldy 1855"
-        },
-        {
-            "name": "OS Town Plans, Kirkcaldy 1894 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Kirkcaldy 1894, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/kirkcaldy1894/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -133.9948193,
+                        54.0031685
+                    ],
                     [
-                        -3.17460426,
-                        56.09513375
+                        -130.0044418,
+                        54.0043387
                     ],
                     [
-                        -3.17560428,
-                        56.12794116
+                        -130.0070826,
+                        57.0000507
                     ],
                     [
-                        -3.12989512,
-                        56.12836777
+                        -131.975877,
+                        56.9995156
                     ],
                     [
-                        -3.12893395,
-                        56.09555983
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/kirkcaldy_2.html",
-            "terms_text": "National Library of Scotland - Kirkcaldy 1894"
-        },
-        {
-            "name": "OS Town Plans, Kirkcudbright 1850 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Kirkcudbright 1850, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/kirkcudbright1850/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -135.1229873,
+                        59.756601
+                    ],
                     [
-                        -4.06154334,
-                        54.82586314
+                        -138.0071813,
+                        59.991805
                     ],
                     [
-                        -4.0623081,
-                        54.84086061
+                        -139.1715881,
+                        60.4127229
                     ],
                     [
-                        -4.0420219,
-                        54.84120364
+                        -140.9874011,
+                        61.0118551
                     ],
                     [
-                        -4.04126464,
-                        54.82620598
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/kirkcudbright_1.html",
-            "terms_text": "National Library of Scotland - Kirkcudbright 1850"
-        },
-        {
-            "name": "OS Town Plans, Kirkcudbright 1893 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Kirkcudbright 1893, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/kirkcudbright1893/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -140.9683975,
+                        69.9535069
+                    ],
                     [
-                        -4.06001868,
-                        54.82720122
+                        -156.176891,
+                        71.5633329
                     ],
                     [
-                        -4.06079036,
-                        54.84234455
+                        -160.413634,
+                        70.7397728
                     ],
                     [
-                        -4.04025067,
-                        54.84269158
+                        -163.0218273,
+                        69.9707435
                     ],
                     [
-                        -4.03948667,
-                        54.82754805
+                        -164.9717003,
+                        68.994689
                     ]
                 ]
             ],
-            "terms_url": "http://maps.nls.uk/townplans/kirkcudbright_2.html",
-            "terms_text": "National Library of Scotland - Kirkcudbright 1893"
+            "overlay": true
         },
         {
-            "name": "OS Town Plans, Kirkintilloch 1859 (NLS)",
+            "name": "OS 1:25k historic (OSM)",
             "type": "tms",
-            "description": "Detailed town plan of Kirkintilloch 1859, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/kirkintilloch/{zoom}/{x}/{-y}.png",
+            "template": "http://ooc.openstreetmap.org/os1/{zoom}/{x}/{y}.jpg",
             "scaleExtent": [
-                13,
-                20
+                6,
+                17
             ],
             "polygon": [
                 [
                     [
-                        -4.16664222,
-                        55.93124287
+                        -9,
+                        49.8
                     ],
                     [
-                        -4.16748402,
-                        55.94631265
+                        -9,
+                        61.1
                     ],
                     [
-                        -4.14637318,
-                        55.94668235
+                        1.9,
+                        61.1
                     ],
                     [
-                        -4.14553956,
-                        55.93161237
+                        1.9,
+                        49.8
+                    ],
+                    [
+                        -9,
+                        49.8
                     ]
                 ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/kirkintilloch.html",
-            "terms_text": "National Library of Scotland - Kirkintilloch 1859"
+            ]
         },
         {
-            "name": "OS Town Plans, Kirriemuir 1861 (NLS)",
+            "name": "OS New Popular Edition historic",
             "type": "tms",
-            "description": "Detailed town plan of Kirriemuir 1861, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/kirriemuir/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
+            "template": "http://ooc.openstreetmap.org/npe/{zoom}/{x}/{y}.png",
             "polygon": [
                 [
                     [
-                        -3.01255744,
-                        56.65896044
+                        -5.8,
+                        49.8
                     ],
                     [
-                        -3.01302683,
-                        56.67645382
+                        -5.8,
+                        55.8
                     ],
                     [
-                        -2.98815879,
-                        56.67665366
+                        1.9,
+                        55.8
                     ],
                     [
-                        -2.98770092,
-                        56.65916014
+                        1.9,
+                        49.8
+                    ],
+                    [
+                        -5.8,
+                        49.8
                     ]
                 ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/kirriemuir.html",
-            "terms_text": "National Library of Scotland - Kirriemuir 1861"
+            ]
         },
         {
-            "name": "OS Town Plans, Lanark 1858 (NLS)",
+            "name": "OS OpenData Locator",
             "type": "tms",
-            "description": "Detailed town plan of Lanark 1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/lanark/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
+            "template": "http://tiles.itoworld.com/os_locator/{zoom}/{x}/{y}.png",
             "polygon": [
                 [
                     [
-                        -3.78642584,
-                        55.66308804
+                        -9,
+                        49.8
                     ],
                     [
-                        -3.78710605,
-                        55.67800854
+                        -9,
+                        61.1
                     ],
                     [
-                        -3.76632876,
-                        55.67830935
+                        1.9,
+                        61.1
                     ],
                     [
-                        -3.76565645,
-                        55.66338868
+                        1.9,
+                        49.8
+                    ],
+                    [
+                        -9,
+                        49.8
                     ]
                 ]
             ],
-            "terms_url": "http://maps.nls.uk/townplans/lanark.html",
-            "terms_text": "National Library of Scotland - Lanark 1858"
+            "overlay": true
         },
         {
-            "name": "OS Town Plans, Linlithgow 1856 (NLS)",
+            "name": "OS OpenData StreetView",
             "type": "tms",
-            "description": "Detailed town plan of Linlithgow 1856, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/linlithgow/{zoom}/{x}/{-y}.png",
+            "template": "http://os.openstreetmap.org/sv/{zoom}/{x}/{y}.png",
             "scaleExtent": [
-                13,
-                20
+                1,
+                18
             ],
             "polygon": [
                 [
                     [
-                        -3.61908334,
-                        55.95549561
+                        -5.8292886,
+                        50.0229734
                     ],
                     [
-                        -3.62033259,
-                        55.98538615
+                        -5.8292886,
+                        50.254819
                     ],
                     [
-                        -3.57838447,
-                        55.98593047
+                        -5.373356,
+                        50.254819
                     ],
                     [
-                        -3.57716753,
-                        55.95603932
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/linlithgow.html",
-            "terms_text": "National Library of Scotland - Linlithgow 1856"
-        },
-        {
-            "name": "OS Town Plans, Mayole 1856-1857 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Mayole 1856-1857, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/maybole/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -5.373356,
+                        50.3530588
+                    ],
                     [
-                        -4.69086378,
-                        55.34340178
+                        -5.1756021,
+                        50.3530588
                     ],
                     [
-                        -4.6918884,
-                        55.35849731
+                        -5.1756021,
+                        50.5925406
                     ],
                     [
-                        -4.67089656,
-                        55.35895813
+                        -4.9970743,
+                        50.5925406
                     ],
                     [
-                        -4.6698799,
-                        55.34386234
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/maybole.html",
-            "terms_text": "National Library of Scotland - Mayole 1856-1857"
-        },
-        {
-            "name": "OS Town Plans, Montrose 1861-1862 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Montrose 1861-1862, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/montrose/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -4.9970743,
+                        50.6935617
+                    ],
                     [
-                        -2.4859324,
-                        56.69645192
+                        -4.7965738,
+                        50.6935617
                     ],
                     [
-                        -2.4862257,
-                        56.71918799
+                        -4.7965738,
+                        50.7822112
                     ],
                     [
-                        -2.45405417,
-                        56.71930941
+                        -4.6949503,
+                        50.7822112
                     ],
                     [
-                        -2.45378027,
-                        56.69657324
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/montrose.html",
-            "terms_text": "National Library of Scotland - Montrose 1861-1862"
-        },
-        {
-            "name": "OS Town Plans, Musselburgh 1853 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Musselburgh 1853, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/musselburgh1853/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -4.6949503,
+                        50.9607371
+                    ],
                     [
-                        -3.07888558,
-                        55.93371953
+                        -4.6043131,
+                        50.9607371
                     ],
                     [
-                        -3.07954151,
-                        55.95729781
+                        -4.6043131,
+                        51.0692066
                     ],
                     [
-                        -3.03240684,
-                        55.95770177
+                        -4.3792215,
+                        51.0692066
                     ],
                     [
-                        -3.03177952,
-                        55.93412313
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/musselburgh_1.html",
-            "terms_text": "National Library of Scotland - Musselburgh 1853"
-        },
-        {
-            "name": "OS Town Plans, Musselburgh 1893 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Musselburgh 1893, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/musselburgh1893/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -4.3792215,
+                        51.2521782
+                    ],
                     [
-                        -3.07017621,
-                        55.92694102
+                        -3.9039346,
+                        51.2521782
                     ],
                     [
-                        -3.07078961,
-                        55.94917624
+                        -3.9039346,
+                        51.2916998
                     ],
                     [
-                        -3.03988228,
-                        55.94944099
+                        -3.7171671,
+                        51.2916998
                     ],
                     [
-                        -3.03928658,
-                        55.92720556
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/musselburgh_2.html",
-            "terms_text": "National Library of Scotland - Musselburgh 1893"
-        },
-        {
-            "name": "OS Town Plans, Nairn 1867-1868 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Nairn 1867-1868, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/nairn/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -3.7171671,
+                        51.2453014
+                    ],
                     [
-                        -3.88433907,
-                        57.57899149
+                        -3.1486246,
+                        51.2453014
                     ],
                     [
-                        -3.88509905,
-                        57.5936822
+                        -3.1486246,
+                        51.362067
                     ],
                     [
-                        -3.85931017,
-                        57.59406441
+                        -3.7446329,
+                        51.362067
                     ],
                     [
-                        -3.85856057,
-                        57.57937348
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/nairn.html",
-            "terms_text": "National Library of Scotland - Nairn 1867-1868"
-        },
-        {
-            "name": "OS Town Plans, Oban 1867-1868 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Oban 1867-1868, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/oban/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -3.7446329,
+                        51.4340386
+                    ],
                     [
-                        -5.49548449,
-                        56.39080407
+                        -3.8297769,
+                        51.4340386
                     ],
                     [
-                        -5.49836627,
-                        56.42219039
+                        -3.8297769,
+                        51.5298246
                     ],
                     [
-                        -5.45383984,
-                        56.42343933
+                        -4.0852091,
+                        51.5298246
                     ],
                     [
-                        -5.45099456,
-                        56.39205153
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/oban.html",
-            "terms_text": "National Library of Scotland - Oban 1867-1868"
-        },
-        {
-            "name": "OS Town Plans, Peebles 1856 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Peebles 1856, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/peebles/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -4.0852091,
+                        51.4939284
+                    ],
                     [
-                        -3.20921287,
-                        55.63635834
+                        -4.3792215,
+                        51.4939284
                     ],
                     [
-                        -3.20990288,
-                        55.65873817
+                        -4.3792215,
+                        51.5427168
                     ],
                     [
-                        -3.17896372,
-                        55.65903935
+                        -5.1444195,
+                        51.5427168
                     ],
                     [
-                        -3.17829135,
-                        55.63665927
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/peebles.html",
-            "terms_text": "National Library of Scotland - Peebles 1856"
-        },
-        {
-            "name": "OS Town Plans, Perth 1860 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Perth 1860, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/perth/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -5.1444195,
+                        51.6296003
+                    ],
                     [
-                        -3.45302495,
-                        56.37794226
+                        -5.7387103,
+                        51.6296003
                     ],
                     [
-                        -3.45416664,
-                        56.40789908
+                        -5.7387103,
+                        51.774037
                     ],
                     [
-                        -3.41187528,
-                        56.40838777
+                        -5.5095393,
+                        51.774037
                     ],
                     [
-                        -3.41076676,
-                        56.3784304
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/perth.html",
-            "terms_text": "National Library of Scotland - Perth 1860"
-        },
-        {
-            "name": "OS Town Plans, Peterhead 1868 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Peterhead 1868, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/peterhead/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -5.5095393,
+                        51.9802596
+                    ],
                     [
-                        -1.80513747,
-                        57.48046916
+                        -5.198799,
+                        51.9802596
                     ],
                     [
-                        -1.80494005,
-                        57.51755411
+                        -5.198799,
+                        52.0973358
                     ],
                     [
-                        -1.75135366,
-                        57.51746003
+                        -4.8880588,
+                        52.0973358
                     ],
                     [
-                        -1.75160539,
-                        57.48037522
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/peterhead",
-            "terms_text": "National Library of Scotland - Peterhead 1868"
-        },
-        {
-            "name": "OS Town Plans, Port Glasgow 1856-1857 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/portglasgow/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -4.8880588,
+                        52.1831557
+                    ],
                     [
-                        -4.70063209,
-                        55.91995983
+                        -4.4957492,
+                        52.1831557
                     ],
                     [
-                        -4.70222026,
-                        55.9427679
+                        -4.4957492,
+                        52.2925739
                     ],
                     [
-                        -4.67084958,
-                        55.94345237
+                        -4.3015365,
+                        52.2925739
                     ],
                     [
-                        -4.6692798,
-                        55.92064372
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/port-glasgow.html",
-            "terms_text": "National Library of Scotland - Port Glasgow 1856-1857"
-        },
-        {
-            "name": "OS Town Plans, Portobello 1893-1894 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Portobello 1893-1894, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/portobello/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -4.3015365,
+                        52.3685318
+                    ],
                     [
-                        -3.12437919,
-                        55.93846889
+                        -4.1811246,
+                        52.3685318
                     ],
                     [
-                        -3.1250234,
-                        55.96068605
+                        -4.1811246,
+                        52.7933685
                     ],
                     [
-                        -3.09394827,
-                        55.96096586
+                        -4.4413696,
+                        52.7933685
                     ],
                     [
-                        -3.09332184,
-                        55.93874847
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/portobello.html",
-            "terms_text": "National Library of Scotland - Portobello 1893-1894"
-        },
-        {
-            "name": "OS Town Plans, Rothesay 1862-1863 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Rothesay 1862-1863, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/rothesay/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -4.4413696,
+                        52.7369614
+                    ],
                     [
-                        -5.06449893,
-                        55.82864114
+                        -4.8569847,
+                        52.7369614
                     ],
                     [
-                        -5.06569719,
-                        55.84385927
+                        -4.8569847,
+                        52.9317255
                     ],
                     [
-                        -5.04413114,
-                        55.84439519
+                        -4.7288044,
+                        52.9317255
                     ],
                     [
-                        -5.04294127,
-                        55.82917676
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/rothesay.html",
-            "terms_text": "National Library of Scotland - Rothesay 1862-1863"
-        },
-        {
-            "name": "OS Town Plans, Selkirk 1865 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/selkirk/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -4.7288044,
+                        53.5038599
+                    ],
                     [
-                        -2.85998582,
-                        55.53499576
+                        -4.1578191,
+                        53.5038599
                     ],
                     [
-                        -2.86063259,
-                        55.56459732
+                        -4.1578191,
+                        53.4113498
                     ],
                     [
-                        -2.82003242,
-                        55.56487574
+                        -3.3110518,
+                        53.4113498
                     ],
                     [
-                        -2.81941615,
-                        55.53527387
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/selkirk.html",
-            "terms_text": "National Library of Scotland - Selkirk 1865"
-        },
-        {
-            "name": "OS Town Plans, St Andrews 1854 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of St Andrews 1854, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/standrews1854/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -3.3110518,
+                        53.5038599
+                    ],
                     [
-                        -2.81342686,
-                        56.32097352
+                        -3.2333667,
+                        53.5038599
                     ],
                     [
-                        -2.81405804,
-                        56.3506222
+                        -3.2333667,
+                        54.0159169
                     ],
                     [
-                        -2.77243712,
-                        56.35088865
+                        -3.3926211,
+                        54.0159169
                     ],
                     [
-                        -2.77183819,
-                        56.32123967
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/st-andrews_1.html",
-            "terms_text": "National Library of Scotland - St Andrews 1854"
-        },
-        {
-            "name": "OS Town Plans, St Andrews 1893 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of St Andrews 1893, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/standrews1893/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -3.3926211,
+                        54.1980953
+                    ],
                     [
-                        -2.81545583,
-                        56.31861733
+                        -3.559644,
+                        54.1980953
                     ],
                     [
-                        -2.81609919,
-                        56.3487653
+                        -3.559644,
+                        54.433732
                     ],
                     [
-                        -2.77387785,
-                        56.34903619
+                        -3.7188984,
+                        54.433732
                     ],
                     [
-                        -2.77326775,
-                        56.31888792
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/st-andrews_2.html",
-            "terms_text": "National Library of Scotland - St Andrews 1893"
-        },
-        {
-            "name": "OS Town Plans, Stirling 1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Stirling 1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/stirling/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -3.7188984,
+                        54.721897
+                    ],
                     [
-                        -3.95768489,
-                        56.10754239
+                        -4.3015365,
+                        54.721897
                     ],
                     [
-                        -3.95882978,
-                        56.13007142
+                        -4.3015365,
+                        54.6140739
                     ],
                     [
-                        -3.92711024,
-                        56.13057046
+                        -5.0473132,
+                        54.6140739
                     ],
                     [
-                        -3.92598386,
-                        56.10804101
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/stirling.html",
-            "terms_text": "National Library of Scotland - Stirling 1858"
-        },
-        {
-            "name": "OS Town Plans, Stonehaven 1864 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Stonehaven 1864, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/stonehaven/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -5.0473132,
+                        54.7532915
+                    ],
                     [
-                        -2.220167,
-                        56.9565098
+                        -5.2298731,
+                        54.7532915
                     ],
                     [
-                        -2.2202543,
-                        56.97129283
+                        -5.2298731,
+                        55.2190799
                     ],
                     [
-                        -2.19924399,
-                        56.9713281
+                        -5.6532567,
+                        55.2190799
                     ],
                     [
-                        -2.19916501,
-                        56.95654504
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/stonehaven.html",
-            "terms_text": "National Library of Scotland - Stonehaven 1864"
-        },
-        {
-            "name": "OS Town Plans, Stranraer 1847 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Stranraer 1847, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/stranraer1847/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
+                        -5.6532567,
+                        55.250088
+                    ],
                     [
-                        -5.04859743,
-                        54.8822997
+                        -5.8979647,
+                        55.250088
                     ],
                     [
-                        -5.0508954,
-                        54.91268061
+                        -5.8979647,
+                        55.4822462
                     ],
                     [
-                        -5.0095373,
-                        54.91371278
+                        -6.5933212,
+                        55.4822462
                     ],
                     [
-                        -5.00727037,
-                        54.88333071
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/stranraer_1.html",
-            "terms_text": "National Library of Scotland - Stranraer 1847"
-        },
-        {
-            "name": "OS Town Plans, Stranraer 1863-1877 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Stranraer 1863-1877, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/stranraer1867/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
-                    [
-                        -5.04877289,
-                        54.88228699
+                        -6.5933212,
+                        56.3013441
                     ],
                     [
-                        -5.05107324,
-                        54.9126976
+                        -7.1727691,
+                        56.3013441
                     ],
                     [
-                        -5.00947337,
-                        54.91373582
+                        -7.1727691,
+                        56.5601822
                     ],
                     [
-                        -5.00720427,
-                        54.88332405
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/stranraer_1a.html",
-            "terms_text": "National Library of Scotland - Stranraer 1863-1877"
-        },
-        {
-            "name": "OS Town Plans, Stranraer 1893 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Stranraer 1893, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/stranraer1893/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
-                    [
-                        -5.04418424,
-                        54.89773858
+                        -6.8171722,
+                        56.5601822
                     ],
                     [
-                        -5.04511026,
-                        54.90999885
+                        -6.8171722,
+                        56.6991713
                     ],
                     [
-                        -5.0140499,
-                        54.91077389
+                        -6.5315276,
+                        56.6991713
                     ],
                     [
-                        -5.0131333,
-                        54.89851327
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/stranraer_2.html",
-            "terms_text": "National Library of Scotland - Stranraer 1893"
-        },
-        {
-            "name": "OS Town Plans, Strathaven 1858 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Strathaven 1858, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/strathaven/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
-                    [
-                        -4.06914872,
-                        55.67242091
+                        -6.5315276,
+                        56.9066964
                     ],
                     [
-                        -4.06954357,
-                        55.67989707
+                        -6.811679,
+                        56.9066964
                     ],
                     [
-                        -4.05917487,
-                        55.6800715
+                        -6.811679,
+                        57.3716613
                     ],
                     [
-                        -4.05878199,
-                        55.67259529
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/strathaven.html",
-            "terms_text": "National Library of Scotland - Strathaven 1858"
-        },
-        {
-            "name": "OS Town Plans, Wick 1872 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Wick 1872, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/wick/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
-                    [
-                        -3.11470001,
-                        58.41344839
+                        -6.8721038,
+                        57.3716613
                     ],
                     [
-                        -3.11588837,
-                        58.45101446
+                        -6.8721038,
+                        57.5518893
                     ],
                     [
-                        -3.05949843,
-                        58.45149284
+                        -7.0973235,
+                        57.5518893
                     ],
                     [
-                        -3.05837008,
-                        58.41392606
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/wick.html",
-            "terms_text": "National Library of Scotland - Wick 1872"
-        },
-        {
-            "name": "OS Town Plans, Wigtown 1848 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/wigtown1848/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
-                    [
-                        -4.45235587,
-                        54.8572296
+                        -7.0973235,
+                        57.2411085
                     ],
                     [
-                        -4.45327284,
-                        54.87232603
+                        -7.1742278,
+                        57.2411085
                     ],
                     [
-                        -4.43254469,
-                        54.87274317
+                        -7.1742278,
+                        56.9066964
                     ],
                     [
-                        -4.43163545,
-                        54.85764651
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/wigtown_1.html",
-            "terms_text": "National Library of Scotland - Wigtown 1848"
-        },
-        {
-            "name": "OS Town Plans, Wigtown 1894 (NLS)",
-            "type": "tms",
-            "description": "Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland.",
-            "template": "http://geo.nls.uk/maps/towns/wigtown1894/{zoom}/{x}/{-y}.png",
-            "scaleExtent": [
-                13,
-                20
-            ],
-            "polygon": [
-                [
-                    [
-                        -4.45233361,
-                        54.85721131
+                        -7.3719817,
+                        56.9066964
                     ],
                     [
-                        -4.45325423,
-                        54.87236807
+                        -7.3719817,
+                        56.8075885
                     ],
                     [
-                        -4.43257837,
-                        54.87278416
+                        -7.5202972,
+                        56.8075885
                     ],
                     [
-                        -4.43166549,
-                        54.85762716
-                    ]
-                ]
-            ],
-            "terms_url": "http://maps.nls.uk/townplans/wigtown_2.html",
-            "terms_text": "National Library of Scotland - Wigtown 1894"
-        },
-        {
-            "name": "OpenPT Map (overlay)",
-            "type": "tms",
-            "template": "http://openptmap.de/tiles/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                5,
-                16
-            ],
-            "polygon": [
-                [
-                    [
-                        6.4901072,
-                        53.665658
+                        -7.5202972,
+                        56.7142479
                     ],
                     [
-                        8.5665347,
-                        53.9848257
+                        -7.8306806,
+                        56.7142479
                     ],
                     [
-                        8.1339457,
-                        54.709715
+                        -7.8306806,
+                        56.8994605
                     ],
                     [
-                        8.317796,
-                        55.0952362
+                        -7.6494061,
+                        56.8994605
                     ],
                     [
-                        10.1887438,
-                        54.7783834
+                        -7.6494061,
+                        57.4739617
                     ],
                     [
-                        10.6321475,
-                        54.4778841
+                        -7.8306806,
+                        57.4739617
                     ],
                     [
-                        11.2702164,
-                        54.6221504
+                        -7.8306806,
+                        57.7915584
                     ],
                     [
-                        11.681176,
-                        54.3709243
+                        -7.4736249,
+                        57.7915584
                     ],
                     [
-                        12.0272473,
-                        54.3898199
+                        -7.4736249,
+                        58.086063
                     ],
                     [
-                        13.3250145,
-                        54.8531617
+                        -7.1879804,
+                        58.086063
                     ],
                     [
-                        13.9198245,
-                        54.6972173
+                        -7.1879804,
+                        58.367197
                     ],
                     [
-                        14.2118221,
-                        54.1308273
+                        -6.8034589,
+                        58.367197
                     ],
                     [
-                        14.493005,
-                        53.2665063
+                        -6.8034589,
+                        58.4155786
                     ],
                     [
-                        14.1577485,
-                        52.8766495
+                        -6.638664,
+                        58.4155786
                     ],
                     [
-                        14.7525584,
-                        52.5819369
+                        -6.638664,
+                        58.4673277
                     ],
                     [
-                        15.0986297,
-                        51.0171541
+                        -6.5178143,
+                        58.4673277
                     ],
                     [
-                        14.9364088,
-                        50.8399279
+                        -6.5178143,
+                        58.5625632
                     ],
                     [
-                        14.730929,
-                        50.7920977
+                        -6.0536224,
+                        58.5625632
                     ],
                     [
-                        14.4389313,
-                        50.8808862
+                        -6.0536224,
+                        58.1568843
                     ],
                     [
-                        12.9573138,
-                        50.3939044
+                        -6.1470062,
+                        58.1568843
                     ],
                     [
-                        12.51391,
-                        50.3939044
+                        -6.1470062,
+                        58.1105865
                     ],
                     [
-                        12.3084302,
-                        50.1173237
+                        -6.2799798,
+                        58.1105865
                     ],
                     [
-                        12.6112425,
-                        49.9088337
+                        -6.2799798,
+                        57.7122664
                     ],
                     [
-                        12.394948,
-                        49.7344006
+                        -6.1591302,
+                        57.7122664
                     ],
                     [
-                        12.7734634,
-                        49.4047626
+                        -6.1591302,
+                        57.6667563
                     ],
                     [
-                        14.1469337,
-                        48.6031036
+                        -5.9339104,
+                        57.6667563
                     ],
                     [
-                        14.6768553,
-                        48.6531391
+                        -5.9339104,
+                        57.8892524
                     ],
                     [
-                        15.0661855,
-                        49.0445497
+                        -5.80643,
+                        57.8892524
                     ],
                     [
-                        16.2666202,
-                        48.7459305
+                        -5.80643,
+                        57.9621767
                     ],
                     [
-                        16.4937294,
-                        48.8741286
+                        -5.6141692,
+                        57.9621767
                     ],
                     [
-                        16.904689,
-                        48.7173975
+                        -5.6141692,
+                        58.0911236
                     ],
                     [
-                        16.9371332,
-                        48.5315383
+                        -5.490819,
+                        58.0911236
                     ],
                     [
-                        16.8384693,
-                        48.3823161
+                        -5.490819,
+                        58.3733281
                     ],
                     [
-                        17.2017097,
-                        48.010204
+                        -5.3199118,
+                        58.3733281
                     ],
                     [
-                        17.1214145,
-                        47.6997605
+                        -5.3199118,
+                        58.75015
                     ],
                     [
-                        16.777292,
-                        47.6585709
+                        -3.5719977,
+                        58.75015
                     ],
                     [
-                        16.6090543,
-                        47.7460598
+                        -3.5719977,
+                        59.2091788
                     ],
                     [
-                        16.410228,
-                        47.6637214
+                        -3.1944501,
+                        59.2091788
                     ],
                     [
-                        16.7352326,
-                        47.6147714
+                        -3.1944501,
+                        59.4759216
                     ],
                     [
-                        16.5555242,
-                        47.3589738
+                        -2.243583,
+                        59.4759216
                     ],
                     [
-                        16.4790525,
-                        46.9768539
+                        -2.243583,
+                        59.1388749
                     ],
                     [
-                        16.0355168,
-                        46.8096295
+                        -2.4611012,
+                        59.1388749
                     ],
                     [
-                        16.0508112,
-                        46.6366332
+                        -2.4611012,
+                        58.8185938
                     ],
                     [
-                        14.9572663,
-                        46.6313822
+                        -2.7407675,
+                        58.8185938
                     ],
                     [
-                        14.574908,
-                        46.3892866
+                        -2.7407675,
+                        58.5804743
                     ],
                     [
-                        12.3954655,
-                        46.6891149
+                        -2.9116746,
+                        58.5804743
                     ],
                     [
-                        12.1507562,
-                        47.0550608
+                        -2.9116746,
+                        58.1157523
                     ],
                     [
-                        11.1183887,
-                        46.9142058
+                        -3.4865441,
+                        58.1157523
                     ],
                     [
-                        11.0342699,
-                        46.7729797
+                        -3.4865441,
+                        57.740386
                     ],
                     [
-                        10.4836739,
-                        46.8462544
+                        -1.7153245,
+                        57.740386
                     ],
                     [
-                        10.4607324,
-                        46.5472973
+                        -1.7153245,
+                        57.2225558
                     ],
                     [
-                        10.1013156,
-                        46.5735879
+                        -1.9794538,
+                        57.2225558
                     ],
                     [
-                        10.2007287,
-                        46.1831867
+                        -1.9794538,
+                        56.8760742
                     ],
                     [
-                        9.8948421,
-                        46.3629068
+                        -2.1658979,
+                        56.8760742
                     ],
                     [
-                        9.5966026,
-                        46.2889758
+                        -2.1658979,
+                        56.6333186
                     ],
                     [
-                        9.2983631,
-                        46.505206
+                        -2.3601106,
+                        56.6333186
                     ],
                     [
-                        9.2830687,
-                        46.2572605
+                        -2.3601106,
+                        56.0477521
                     ],
                     [
-                        9.0536537,
-                        45.7953255
+                        -1.9794538,
+                        56.0477521
                     ],
                     [
-                        8.4265861,
-                        46.2466846
+                        -1.9794538,
+                        55.8650949
                     ],
                     [
-                        8.4418804,
-                        46.4736161
+                        -1.4745008,
+                        55.8650949
                     ],
                     [
-                        7.8759901,
-                        45.9284607
+                        -1.4745008,
+                        55.2499926
                     ],
                     [
-                        7.0959791,
-                        45.8645956
+                        -1.3221997,
+                        55.2499926
                     ],
                     [
-                        6.7747981,
-                        46.1620044
+                        -1.3221997,
+                        54.8221737
                     ],
                     [
-                        6.8206811,
-                        46.4051083
+                        -1.0550014,
+                        54.8221737
                     ],
                     [
-                        6.5453831,
-                        46.4578142
+                        -1.0550014,
+                        54.6746628
                     ],
                     [
-                        6.3312624,
-                        46.3840116
+                        -0.6618765,
+                        54.6746628
                     ],
                     [
-                        6.3847926,
-                        46.2466846
+                        -0.6618765,
+                        54.5527463
                     ],
                     [
-                        5.8953739,
-                        46.0878021
+                        -0.3247617,
+                        54.5527463
                     ],
                     [
-                        6.1171418,
-                        46.3681838
+                        -0.3247617,
+                        54.2865195
                     ],
                     [
-                        6.0942003,
-                        46.5998657
+                        0.0092841,
+                        54.2865195
                     ],
                     [
-                        6.4383228,
-                        46.7782169
+                        0.0092841,
+                        53.7938518
                     ],
                     [
-                        6.4306756,
-                        46.9298747
+                        0.2081962,
+                        53.7938518
                     ],
                     [
-                        7.0806847,
-                        47.3460216
+                        0.2081962,
+                        53.5217726
                     ],
                     [
-                        6.8436226,
-                        47.3719227
+                        0.4163548,
+                        53.5217726
                     ],
                     [
-                        6.9965659,
-                        47.5012373
+                        0.4163548,
+                        53.0298851
                     ],
                     [
-                        7.1800979,
-                        47.5064033
+                        1.4273388,
+                        53.0298851
                     ],
                     [
-                        7.2336281,
-                        47.439206
+                        1.4273388,
+                        52.92021
                     ],
                     [
-                        7.4553959,
-                        47.4805683
+                        1.8333912,
+                        52.92021
                     ],
                     [
-                        7.7842241,
-                        48.645735
+                        1.8333912,
+                        52.042488
                     ],
                     [
-                        8.1971711,
-                        49.0282701
+                        1.5235504,
+                        52.042488
                     ],
                     [
-                        7.6006921,
-                        49.0382974
+                        1.5235504,
+                        51.8261335
                     ],
                     [
-                        7.4477487,
-                        49.1634679
+                        1.2697049,
+                        51.8261335
                     ],
                     [
-                        7.2030394,
-                        49.1034255
+                        1.2697049,
+                        51.6967453
                     ],
                     [
-                        6.6677378,
-                        49.1634679
+                        1.116651,
+                        51.6967453
                     ],
                     [
-                        6.6371491,
-                        49.3331933
+                        1.116651,
+                        51.440346
                     ],
                     [
-                        6.3542039,
-                        49.4576194
+                        1.5235504,
+                        51.440346
                     ],
                     [
-                        6.5453831,
-                        49.8043366
+                        1.5235504,
+                        51.3331831
                     ],
                     [
-                        6.2471436,
-                        49.873384
+                        1.4507565,
+                        51.3331831
                     ],
                     [
-                        6.0789059,
-                        50.1534883
+                        1.4507565,
+                        51.0207553
                     ],
                     [
-                        6.3618511,
-                        50.3685934
+                        1.0699883,
+                        51.0207553
                     ],
                     [
-                        6.0865531,
-                        50.7039632
+                        1.0699883,
+                        50.9008416
                     ],
                     [
-                        5.8800796,
-                        51.0513752
+                        0.7788126,
+                        50.9008416
                     ],
                     [
-                        6.1247889,
-                        51.1618085
+                        0.7788126,
+                        50.729843
                     ],
                     [
-                        6.1936134,
-                        51.491527
+                        -0.7255952,
+                        50.729843
                     ],
                     [
-                        5.9641984,
-                        51.7526501
+                        -0.7255952,
+                        50.7038437
                     ],
                     [
-                        6.0253758,
-                        51.8897286
+                        -1.0074383,
+                        50.7038437
                     ],
                     [
-                        6.4536171,
-                        51.8661241
+                        -1.0074383,
+                        50.5736307
                     ],
                     [
-                        6.8436226,
-                        51.9557552
+                        -2.3625252,
+                        50.5736307
                     ],
                     [
-                        6.6906793,
-                        52.0499105
+                        -2.3625252,
+                        50.4846421
                     ],
                     [
-                        7.0042131,
-                        52.2282603
+                        -2.4987805,
+                        50.4846421
                     ],
                     [
-                        7.0195074,
-                        52.4525245
+                        -2.4987805,
+                        50.5736307
                     ],
                     [
-                        6.6983264,
-                        52.4665032
+                        -3.4096378,
+                        50.5736307
                     ],
                     [
-                        6.6906793,
-                        52.6524628
+                        -3.4096378,
+                        50.2057837
                     ],
                     [
-                        7.0348017,
-                        52.6385432
+                        -3.6922446,
+                        50.2057837
                     ],
                     [
-                        7.0730376,
-                        52.8330151
+                        -3.6922446,
+                        50.1347737
                     ],
                     [
-                        7.2183337,
-                        52.9852064
+                        -5.005468,
+                        50.1347737
                     ],
                     [
-                        7.1953922,
-                        53.3428087
+                        -5.005468,
+                        49.9474456
                     ],
                     [
-                        7.0042131,
-                        53.3291098
-                    ]
-                ]
-            ],
-            "terms_url": "http://openstreetmap.org/",
-            "terms_text": "© OpenStreetMap contributors, CC-BY-SA"
-        },
-        {
-            "name": "OpenStreetMap (Mapnik)",
-            "type": "tms",
-            "description": "The default OpenStreetMap layer.",
-            "template": "http://tile.openstreetmap.org/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                0,
-                19
-            ],
-            "terms_url": "http://openstreetmap.org/",
-            "terms_text": "© OpenStreetMap contributors, CC-BY-SA",
-            "id": "MAPNIK",
-            "default": true
-        },
-        {
-            "name": "OpenStreetMap GPS traces",
-            "type": "tms",
-            "description": "Public GPS traces uploaded to OpenStreetMap.",
-            "template": "http://{switch:a,b,c}.gps-tile.openstreetmap.org/lines/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                0,
-                20
-            ],
-            "terms_url": "http://www.openstreetmap.org/copyright",
-            "terms_text": "© OpenStreetMap contributors",
-            "terms_html": "© <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap contributors</a>. North: <span style='display: inline-block; width: 10px; height: 10px; background-color: #7fed11;'></span> South: <span style='display: inline-block; width: 10px; height: 10px; background-color: #7f11ed;'></span> East: <span style='display: inline-block; width: 10px; height: 10px; background-color: #ff3f3f;'></span> West: <span style='display: inline-block; width: 10px; height: 10px; background-color: #00bfbf;'></span>",
-            "overlay": true
-        },
-        {
-            "name": "Pangasinán/Bulacan (Phillipines HiRes)",
-            "type": "tms",
-            "template": "http://gravitystorm.dev.openstreetmap.org/imagery/philippines/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                12,
-                19
-            ],
-            "polygon": [
-                [
-                    [
-                        120.336593,
-                        15.985768
+                        -5.2839506,
+                        49.9474456
                     ],
                     [
-                        120.445995,
-                        15.984
-                    ],
+                        -5.2839506,
+                        50.0229734
+                    ]
+                ],
+                [
                     [
-                        120.446134,
-                        15.974459
+                        -6.4580707,
+                        49.8673563
                     ],
                     [
-                        120.476464,
-                        15.974592
+                        -6.4580707,
+                        49.9499935
                     ],
                     [
-                        120.594247,
-                        15.946832
+                        -6.3978807,
+                        49.9499935
                     ],
                     [
-                        120.598064,
-                        16.090795
+                        -6.3978807,
+                        50.0053797
                     ],
                     [
-                        120.596537,
-                        16.197999
+                        -6.1799606,
+                        50.0053797
                     ],
                     [
-                        120.368537,
-                        16.218527
+                        -6.1799606,
+                        49.9168614
                     ],
                     [
-                        120.347576,
-                        16.042308
+                        -6.2540201,
+                        49.9168614
                     ],
                     [
-                        120.336593,
-                        15.985768
+                        -6.2540201,
+                        49.8673563
                     ]
                 ],
                 [
                     [
-                        120.8268,
-                        15.3658
+                        -5.8343165,
+                        49.932156
                     ],
                     [
-                        121.2684,
-                        15.2602
+                        -5.8343165,
+                        49.9754641
                     ],
                     [
-                        121.2699,
-                        14.7025
+                        -5.7683254,
+                        49.9754641
                     ],
                     [
-                        120.695,
-                        14.8423
+                        -5.7683254,
+                        49.932156
                     ]
-                ]
-            ]
-        },
-        {
-            "name": "Slovakia EEA CORINE 2006",
-            "type": "tms",
-            "template": "http://www.freemap.sk/tms/clc/{zoom}/{x}/{y}.png",
-            "polygon": [
+                ],
                 [
                     [
-                        19.83682,
-                        49.25529
+                        -1.9483797,
+                        60.6885737
                     ],
                     [
-                        19.80075,
-                        49.42385
+                        -1.9483797,
+                        60.3058841
                     ],
                     [
-                        19.60437,
-                        49.48058
+                        -1.7543149,
+                        60.3058841
                     ],
                     [
-                        19.49179,
-                        49.63961
+                        -1.7543149,
+                        60.1284428
                     ],
                     [
-                        19.21831,
-                        49.52604
+                        -1.5754914,
+                        60.1284428
                     ],
                     [
-                        19.16778,
-                        49.42521
+                        -1.5754914,
+                        59.797917
                     ],
                     [
-                        19.00308,
-                        49.42236
+                        -1.0316959,
+                        59.797917
                     ],
                     [
-                        18.97611,
-                        49.5308
+                        -1.0316959,
+                        60.0354518
                     ],
                     [
-                        18.54685,
-                        49.51425
+                        -0.6626918,
+                        60.0354518
                     ],
                     [
-                        18.31432,
-                        49.33818
+                        -0.6626918,
+                        60.9103862
                     ],
                     [
-                        18.15913,
-                        49.2961
+                        -1.1034395,
+                        60.9103862
                     ],
                     [
-                        18.05564,
-                        49.11134
+                        -1.1034395,
+                        60.8040022
                     ],
                     [
-                        17.56396,
-                        48.84938
+                        -1.3506319,
+                        60.8040022
                     ],
                     [
-                        17.17929,
-                        48.88816
-                    ],
+                        -1.3506319,
+                        60.6885737
+                    ]
+                ],
+                [
                     [
-                        17.058,
-                        48.81105
+                        -2.203381,
+                        60.1968568
                     ],
                     [
-                        16.90426,
-                        48.61947
+                        -2.203381,
+                        60.0929443
                     ],
                     [
-                        16.79685,
-                        48.38561
+                        -1.9864011,
+                        60.0929443
                     ],
                     [
-                        17.06762,
-                        48.01116
-                    ],
+                        -1.9864011,
+                        60.1968568
+                    ]
+                ],
+                [
                     [
-                        17.32787,
-                        47.97749
+                        -1.7543149,
+                        59.5698289
                     ],
                     [
-                        17.51699,
-                        47.82535
+                        -1.7543149,
+                        59.4639383
                     ],
                     [
-                        17.74776,
-                        47.73093
+                        -1.5373349,
+                        59.4639383
                     ],
                     [
-                        18.29515,
-                        47.72075
-                    ],
+                        -1.5373349,
+                        59.5698289
+                    ]
+                ],
+                [
                     [
-                        18.67959,
-                        47.75541
+                        -4.5585981,
+                        59.1370518
                     ],
                     [
-                        18.89755,
-                        47.81203
+                        -4.5585981,
+                        58.9569099
                     ],
                     [
-                        18.79463,
-                        47.88245
+                        -4.2867004,
+                        58.9569099
                     ],
                     [
-                        18.84318,
-                        48.04046
-                    ],
+                        -4.2867004,
+                        59.1370518
+                    ]
+                ],
+                [
                     [
-                        19.46212,
-                        48.05333
+                        -6.2787732,
+                        59.2025744
                     ],
                     [
-                        19.62064,
-                        48.22938
+                        -6.2787732,
+                        59.0227769
                     ],
                     [
-                        19.89585,
-                        48.09387
+                        -5.6650612,
+                        59.0227769
                     ],
                     [
-                        20.33766,
-                        48.2643
-                    ],
+                        -5.6650612,
+                        59.2025744
+                    ]
+                ],
+                [
                     [
-                        20.55395,
-                        48.52358
+                        -8.7163482,
+                        57.9440556
                     ],
                     [
-                        20.82335,
-                        48.55714
+                        -8.7163482,
+                        57.7305936
                     ],
                     [
-                        21.10271,
-                        48.47096
+                        -8.3592926,
+                        57.7305936
                     ],
                     [
-                        21.45863,
-                        48.55513
-                    ],
+                        -8.3592926,
+                        57.9440556
+                    ]
+                ],
+                [
                     [
-                        21.74536,
-                        48.31435
+                        -7.6077005,
+                        50.4021026
                     ],
                     [
-                        22.15293,
-                        48.37179
+                        -7.6077005,
+                        50.2688657
                     ],
                     [
-                        22.61255,
-                        49.08914
+                        -7.3907205,
+                        50.2688657
                     ],
                     [
-                        22.09997,
-                        49.23814
-                    ],
+                        -7.3907205,
+                        50.4021026
+                    ]
+                ],
+                [
                     [
-                        21.9686,
-                        49.36363
+                        -7.7304303,
+                        58.3579902
                     ],
                     [
-                        21.6244,
-                        49.46989
+                        -7.7304303,
+                        58.248313
                     ],
                     [
-                        21.06873,
-                        49.46402
+                        -7.5134503,
+                        58.248313
                     ],
                     [
-                        20.94336,
-                        49.31088
+                        -7.5134503,
+                        58.3579902
+                    ]
+                ]
+            ]
+        },
+        {
+            "name": "OS Scottish Popular historic",
+            "type": "tms",
+            "template": "http://ooc.openstreetmap.org/npescotland/tiles/{zoom}/{x}/{y}.jpg",
+            "scaleExtent": [
+                6,
+                15
+            ],
+            "polygon": [
+                [
+                    [
+                        -7.8,
+                        54.5
                     ],
                     [
-                        20.73052,
-                        49.44006
+                        -7.8,
+                        61.1
                     ],
                     [
-                        20.22804,
-                        49.41714
+                        -1.1,
+                        61.1
                     ],
                     [
-                        20.05234,
-                        49.23052
+                        -1.1,
+                        54.5
                     ],
                     [
-                        19.83682,
-                        49.25529
+                        -7.8,
+                        54.5
                     ]
                 ]
-            ],
-            "terms_url": "http://www.eea.europa.eu/data-and-maps/data/clc-2006-vector-data-version-1",
-            "terms_text": "EEA Corine 2006"
+            ]
         },
         {
-            "name": "Slovakia EEA GMES Urban Atlas",
+            "name": "OS Town Plans, Aberdeen 1866-1867 (NLS)",
             "type": "tms",
-            "template": "http://www.freemap.sk/tms/urbanatlas/{zoom}/{x}/{y}.png",
+            "description": "Detailed town plan of Aberdeen 1866-1867, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/aberdeen/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
             "polygon": [
                 [
                     [
-                        19.83682,
-                        49.25529
+                        -2.14039404,
+                        57.11218789
                     ],
                     [
-                        19.80075,
-                        49.42385
+                        -2.14064752,
+                        57.17894161
                     ],
                     [
-                        19.60437,
-                        49.48058
+                        -2.04501987,
+                        57.17901252
                     ],
                     [
-                        19.49179,
-                        49.63961
-                    ],
+                        -2.04493842,
+                        57.11225862
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/aberdeen.html",
+            "terms_text": "National Library of Scotland - Aberdeen 1866-1867"
+        },
+        {
+            "name": "OS Town Plans, Airdrie 1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Airdrie 1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/airdrie/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        19.21831,
-                        49.52604
+                        -3.99291738,
+                        55.86408041
                     ],
                     [
-                        19.16778,
-                        49.42521
+                        -3.99338933,
+                        55.87329115
                     ],
                     [
-                        19.00308,
-                        49.42236
+                        -3.9691085,
+                        55.87368212
                     ],
                     [
-                        18.97611,
-                        49.5308
-                    ],
-                    [
-                        18.54685,
-                        49.51425
-                    ],
-                    [
-                        18.31432,
-                        49.33818
-                    ],
+                        -3.9686423,
+                        55.86447124
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/airdrie.html",
+            "terms_text": "National Library of Scotland - Airdrie 1858"
+        },
+        {
+            "name": "OS Town Plans, Alexandria 1859 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Alexandria 1859, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/alexandria/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        18.15913,
-                        49.2961
+                        -4.58973571,
+                        55.97536707
                     ],
                     [
-                        18.05564,
-                        49.11134
+                        -4.59104461,
+                        55.99493153
                     ],
                     [
-                        17.56396,
-                        48.84938
+                        -4.55985072,
+                        55.99558348
                     ],
                     [
-                        17.17929,
-                        48.88816
-                    ],
+                        -4.55855754,
+                        55.97601855
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/alexandria.html",
+            "terms_text": "National Library of Scotland - Alexandria 1859"
+        },
+        {
+            "name": "OS Town Plans, Alloa 1861-1862 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Alloa 1861-1862, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/alloa/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        17.058,
-                        48.81105
+                        -3.81166061,
+                        56.09864363
                     ],
                     [
-                        16.90426,
-                        48.61947
+                        -3.81274448,
+                        56.12169929
                     ],
                     [
-                        16.79685,
-                        48.38561
+                        -3.7804609,
+                        56.12216898
                     ],
                     [
-                        17.06762,
-                        48.01116
-                    ],
+                        -3.77939631,
+                        56.09911292
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/alloa.html",
+            "terms_text": "National Library of Scotland - Alloa 1861-1862"
+        },
+        {
+            "name": "OS Town Plans, Annan 1859 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Annan 1859, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/annan/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        17.32787,
-                        47.97749
+                        -3.27921439,
+                        54.98252155
                     ],
                     [
-                        17.51699,
-                        47.82535
+                        -3.27960062,
+                        54.9946601
                     ],
                     [
-                        17.74776,
-                        47.73093
+                        -3.24866331,
+                        54.99498165
                     ],
                     [
-                        18.29515,
-                        47.72075
-                    ],
+                        -3.24828642,
+                        54.98284297
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/annan.html",
+            "terms_text": "National Library of Scotland - Annan 1859"
+        },
+        {
+            "name": "OS Town Plans, Arbroath 1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Arbroath 1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/arbroath/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        18.67959,
-                        47.75541
+                        -2.60716469,
+                        56.53995105
                     ],
                     [
-                        18.89755,
-                        47.81203
+                        -2.60764981,
+                        56.57022426
                     ],
                     [
-                        18.79463,
-                        47.88245
+                        -2.56498708,
+                        56.57042549
                     ],
                     [
-                        18.84318,
-                        48.04046
-                    ],
+                        -2.564536,
+                        56.54015206
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/arbroath.html",
+            "terms_text": "National Library of Scotland - Arbroath 1858"
+        },
+        {
+            "name": "OS Town Plans, Ayr 1855 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Ayr 1855, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/ayr/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        19.46212,
-                        48.05333
+                        -4.66768105,
+                        55.43748864
                     ],
                     [
-                        19.62064,
-                        48.22938
+                        -4.67080057,
+                        55.48363961
                     ],
                     [
-                        19.89585,
-                        48.09387
+                        -4.60609844,
+                        55.48503484
                     ],
                     [
-                        20.33766,
-                        48.2643
-                    ],
+                        -4.60305426,
+                        55.43888149
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/ayr.html",
+            "terms_text": "National Library of Scotland - Ayr 1855"
+        },
+        {
+            "name": "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Berwick-upon-Tweed 1852, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/berwick/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        20.55395,
-                        48.52358
+                        -2.02117487,
+                        55.75577627
                     ],
                     [
-                        20.82335,
-                        48.55714
+                        -2.02118763,
+                        55.77904118
                     ],
                     [
-                        21.10271,
-                        48.47096
+                        -1.98976956,
+                        55.77904265
                     ],
                     [
-                        21.45863,
-                        48.55513
-                    ],
+                        -1.9897755,
+                        55.75577774
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/berwick.html",
+            "terms_text": "National Library of Scotland - Berwick-upon-Tweed 1852"
+        },
+        {
+            "name": "OS Town Plans, Brechin 1862 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Brechin 1862, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/brechin/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        21.74536,
-                        48.31435
+                        -2.67480248,
+                        56.71456775
                     ],
                     [
-                        22.15293,
-                        48.37179
+                        -2.67521172,
+                        56.73739937
                     ],
                     [
-                        22.61255,
-                        49.08914
+                        -2.64319679,
+                        56.73756872
                     ],
                     [
-                        22.09997,
-                        49.23814
-                    ],
+                        -2.64280695,
+                        56.71473694
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/brechin.html",
+            "terms_text": "National Library of Scotland - Brechin 1862"
+        },
+        {
+            "name": "OS Town Plans, Burntisland 1894 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Burntisland 1894, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/burntisland/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        21.9686,
-                        49.36363
+                        -3.24879624,
+                        56.04240046
                     ],
                     [
-                        21.6244,
-                        49.46989
+                        -3.2495182,
+                        56.06472996
                     ],
                     [
-                        21.06873,
-                        49.46402
+                        -3.21830572,
+                        56.06504207
                     ],
                     [
-                        20.94336,
-                        49.31088
-                    ],
+                        -3.21760179,
+                        56.0427123
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/burntisland.html",
+            "terms_text": "National Library of Scotland - Burntisland 1894"
+        },
+        {
+            "name": "OS Town Plans, Campbelton 1865 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Campbelton 1865, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/campbeltown/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        20.73052,
-                        49.44006
+                        -5.62345307,
+                        55.40255998
                     ],
                     [
-                        20.22804,
-                        49.41714
+                        -5.62631353,
+                        55.43375303
                     ],
                     [
-                        20.05234,
-                        49.23052
+                        -5.58276654,
+                        55.43503753
                     ],
                     [
-                        19.83682,
-                        49.25529
+                        -5.57994024,
+                        55.40384299
                     ]
                 ]
             ],
-            "terms_url": "http://www.eea.europa.eu/data-and-maps/data/urban-atlas",
-            "terms_text": "EEA GMES Urban Atlas"
+            "terms_url": "http://maps.nls.uk/townplans/campbelton.html",
+            "terms_text": "National Library of Scotland - Campbelton 1865"
         },
         {
-            "name": "Slovakia Historic Maps",
+            "name": "OS Town Plans, Coatbridge 1858 (NLS)",
             "type": "tms",
-            "template": "http://tms.freemap.sk/historicke/{zoom}/{x}/{y}.png",
+            "description": "Detailed town plan of Coatbridge 1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/coatbridge/{zoom}/{x}/{-y}.png",
             "scaleExtent": [
-                0,
-                12
+                13,
+                20
             ],
             "polygon": [
                 [
                     [
-                        16.8196949,
-                        47.4927236
-                    ],
-                    [
-                        16.8196949,
-                        49.5030322
+                        -4.05035921,
+                        55.84648689
                     ],
                     [
-                        22.8388318,
-                        49.5030322
+                        -4.05157062,
+                        55.86947193
                     ],
                     [
-                        22.8388318,
-                        47.4927236
+                        -4.01953905,
+                        55.87000186
                     ],
                     [
-                        16.8196949,
-                        47.4927236
+                        -4.01834651,
+                        55.84701638
                     ]
                 ]
-            ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/coatbridge.html",
+            "terms_text": "National Library of Scotland - Coatbridge 1858"
         },
         {
-            "name": "South Africa CD:NGI Aerial",
+            "name": "OS Town Plans, Cupar 1854 (NLS)",
             "type": "tms",
-            "template": "http://{switch:a,b,c}.aerial.openstreetmap.org.za/ngi-aerial/{zoom}/{x}/{y}.jpg",
+            "description": "Detailed town plan of Cupar 1854, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/cupar1854/{zoom}/{x}/{-y}.png",
             "scaleExtent": [
-                1,
-                22
+                13,
+                20
             ],
             "polygon": [
                 [
                     [
-                        17.8396817,
-                        -32.7983384
+                        -3.04765872,
+                        56.28653177
                     ],
                     [
-                        17.8893509,
-                        -32.6972835
+                        -3.04890965,
+                        56.332192
                     ],
                     [
-                        18.00364,
-                        -32.6982187
+                        -2.98498515,
+                        56.33271677
                     ],
                     [
-                        18.0991679,
-                        -32.7485251
-                    ],
+                        -2.98381041,
+                        56.28705563
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/cupar_1.html",
+            "terms_text": "National Library of Scotland - Cupar 1854"
+        },
+        {
+            "name": "OS Town Plans, Cupar 1893-1894 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Cupar 1893-1894, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/cupar1893/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        18.2898747,
-                        -32.5526645
+                        -3.0327697,
+                        56.30243657
                     ],
                     [
-                        18.2930182,
-                        -32.0487089
+                        -3.03338443,
+                        56.32520139
                     ],
                     [
-                        18.105455,
-                        -31.6454966
+                        -3.00146629,
+                        56.32546356
                     ],
                     [
-                        17.8529257,
-                        -31.3443951
-                    ],
+                        -3.00087054,
+                        56.30269852
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/cupar_2.html",
+            "terms_text": "National Library of Scotland - Cupar 1893-1894"
+        },
+        {
+            "name": "OS Town Plans, Dalkeith 1852 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Dalkeith 1852, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/dalkeith1852/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        17.5480046,
-                        -30.902171
+                        -3.07862465,
+                        55.88900264
                     ],
                     [
-                        17.4044506,
-                        -30.6374731
+                        -3.0790381,
+                        55.90389729
                     ],
                     [
-                        17.2493704,
-                        -30.3991663
+                        -3.05835611,
+                        55.90407681
                     ],
                     [
-                        16.9936977,
-                        -29.6543552
-                    ],
+                        -3.05795059,
+                        55.88918206
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/dalkeith_1.html",
+            "terms_text": "National Library of Scotland - Dalkeith 1852"
+        },
+        {
+            "name": "OS Town Plans, Dalkeith 1893 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Dalkeith 1893, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/dalkeith1893/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        16.7987996,
-                        -29.19437
+                        -3.08600192,
+                        55.87936087
                     ],
                     [
-                        16.5494139,
-                        -28.8415949
+                        -3.08658588,
+                        55.90025926
                     ],
                     [
-                        16.4498691,
-                        -28.691876
+                        -3.0436473,
+                        55.90063074
                     ],
                     [
-                        16.4491046,
-                        -28.5515766
-                    ],
+                        -3.04308639,
+                        55.87973206
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/dalkeith_2.html",
+            "terms_text": "National Library of Scotland - Dalkeith 1893"
+        },
+        {
+            "name": "OS Town Plans, Dumbarton 1859 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Dumbarton 1859, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/dumbarton/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        16.6002551,
-                        -28.4825663
+                        -4.58559982,
+                        55.92742578
                     ],
                     [
-                        16.7514057,
-                        -28.4486958
+                        -4.58714245,
+                        55.95056014
                     ],
                     [
-                        16.7462192,
-                        -28.2458973
+                        -4.55463269,
+                        55.95123882
                     ],
                     [
-                        16.8855148,
-                        -28.04729
-                    ],
+                        -4.55310939,
+                        55.92810387
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/dumbarton.html",
+            "terms_text": "National Library of Scotland - Dumbarton 1859"
+        },
+        {
+            "name": "OS Town Plans, Dumfries 1850 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Dumfries 1850, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/dumfries1850/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        16.9929502,
-                        -28.0244005
+                        -3.63928076,
+                        55.03715991
                     ],
                     [
-                        17.0529659,
-                        -28.0257086
+                        -3.64116352,
+                        55.08319002
                     ],
                     [
-                        17.1007562,
-                        -28.0338839
+                        -3.57823183,
+                        55.08402202
                     ],
                     [
-                        17.2011527,
-                        -28.0930546
-                    ],
+                        -3.57642118,
+                        55.0379905
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/dumfries_1.html",
+            "terms_text": "National Library of Scotland - Dumfries 1850"
+        },
+        {
+            "name": "OS Town Plans, Dumfries 1893 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Dumfries 1893, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/dumfries1893/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        17.2026346,
-                        -28.2328424
+                        -3.63179081,
+                        55.04150111
                     ],
                     [
-                        17.2474611,
-                        -28.2338215
+                        -3.63330662,
+                        55.07873429
                     ],
                     [
-                        17.2507953,
-                        -28.198892
+                        -3.58259012,
+                        55.07940411
                     ],
                     [
-                        17.3511919,
-                        -28.1975861
-                    ],
+                        -3.58112132,
+                        55.04217001
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/dumfries_2.html",
+            "terms_text": "National Library of Scotland - Dumfries 1893"
+        },
+        {
+            "name": "OS Town Plans, Dundee 1857-1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Dundee 1857-1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/dundee1857/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        17.3515624,
-                        -28.2442655
+                        -3.02584468,
+                        56.44879161
                     ],
                     [
-                        17.4015754,
-                        -28.2452446
+                        -3.02656969,
+                        56.47566815
                     ],
                     [
-                        17.4149122,
-                        -28.3489751
+                        -2.94710317,
+                        56.47629984
                     ],
                     [
-                        17.4008345,
-                        -28.547997
-                    ],
+                        -2.94643424,
+                        56.44942266
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/dundee_1.html",
+            "terms_text": "National Library of Scotland - Dundee 1857-1858"
+        },
+        {
+            "name": "OS Town Plans, Dundee 1870-1872 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Dundee 1870-1872, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/dundee1870/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        17.4526999,
-                        -28.5489733
+                        -3.03399945,
+                        56.448497
                     ],
                     [
-                        17.4512071,
-                        -28.6495106
+                        -3.03497463,
+                        56.48435238
                     ],
                     [
-                        17.4983599,
-                        -28.6872054
+                        -2.92352705,
+                        56.48523137
                     ],
                     [
-                        17.6028204,
-                        -28.6830048
-                    ],
+                        -2.92265681,
+                        56.4493748
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/dundee_2.html",
+            "terms_text": "National Library of Scotland - Dundee 1870-1872"
+        },
+        {
+            "name": "OS Town Plans, Dunfermline 1854 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Dunfermline 1854, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/dunfermline1854/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        17.6499732,
-                        -28.6967928
+                        -3.49045481,
+                        56.0605979
                     ],
                     [
-                        17.6525928,
-                        -28.7381457
+                        -3.49116489,
+                        56.07898822
                     ],
                     [
-                        17.801386,
-                        -28.7381457
+                        -3.44374075,
+                        56.07955208
                     ],
                     [
-                        17.9994276,
-                        -28.7560602
-                    ],
+                        -3.44305323,
+                        56.06116138
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/dunfermline_1.html",
+            "terms_text": "National Library of Scotland - Dunfermline 1854"
+        },
+        {
+            "name": "OS Town Plans, Dunfermline 1894 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Dunfermline 1894, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/dunfermline1893/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        18.0002748,
-                        -28.7956172
+                        -3.48284159,
+                        56.05198219
                     ],
                     [
-                        18.1574507,
-                        -28.8718055
+                        -3.48399434,
+                        56.08198924
                     ],
                     [
-                        18.5063811,
-                        -28.8718055
+                        -3.44209721,
+                        56.08248587
                     ],
                     [
-                        18.6153564,
-                        -28.8295875
-                    ],
+                        -3.44097697,
+                        56.05247826
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/dunfermline_2.html",
+            "terms_text": "National Library of Scotland - Dunfermline 1894"
+        },
+        {
+            "name": "OS Town Plans, Edinburgh 1849-1851 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Edinburgh 1849-1851, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/edinburgh1849/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        18.9087513,
-                        -28.8277516
+                        -3.2361048,
+                        55.921366
                     ],
                     [
-                        19.1046973,
-                        -28.9488548
+                        -3.23836397,
+                        55.99217223
                     ],
                     [
-                        19.1969071,
-                        -28.9378513
+                        -3.14197035,
+                        55.99310288
                     ],
                     [
-                        19.243012,
-                        -28.8516164
-                    ],
+                        -3.13988689,
+                        55.92229419
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/edinburgh1056_1.html",
+            "terms_text": "National Library of Scotland - Edinburgh 1849-1851"
+        },
+        {
+            "name": "OS Town Plans, Edinburgh 1876-1877 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Edinburgh 1876-1877, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/edinburgh1876/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        19.2314858,
-                        -28.802963
+                        -3.24740498,
+                        55.92116518
                     ],
                     [
-                        19.2587296,
-                        -28.7009928
+                        -3.24989581,
+                        55.99850896
                     ],
                     [
-                        19.4431493,
-                        -28.6973163
+                        -3.13061127,
+                        55.99966059
                     ],
                     [
-                        19.5500289,
-                        -28.4958332
-                    ],
+                        -3.12835798,
+                        55.92231348
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/edinburgh1056_2.html",
+            "terms_text": "National Library of Scotland - Edinburgh 1876-1877"
+        },
+        {
+            "name": "OS Town Plans, Edinburgh 1893-1894 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Edinburgh 1893-1894, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/edinburgh1893/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        19.6967264,
-                        -28.4939914
+                        -3.26111081,
+                        55.89555387
                     ],
                     [
-                        19.698822,
-                        -28.4479358
+                        -3.26450423,
+                        55.9997912
                     ],
                     [
-                        19.8507587,
-                        -28.4433291
+                        -3.11970824,
+                        56.00119128
                     ],
                     [
-                        19.8497109,
-                        -28.4027818
-                    ],
+                        -3.1167031,
+                        55.89694851
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/edinburgh500.html",
+            "terms_text": "National Library of Scotland - Edinburgh 1893-1894"
+        },
+        {
+            "name": "OS Town Plans, Elgin 1868 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Elgin 1868, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/elgin/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        19.9953605,
-                        -28.399095
+                        -3.33665196,
+                        57.62879017
                     ],
                     [
-                        19.9893671,
-                        -24.7497859
+                        -3.33776583,
+                        57.65907381
                     ],
                     [
-                        20.2916682,
-                        -24.9192346
+                        -3.29380859,
+                        57.65953111
                     ],
                     [
-                        20.4724562,
-                        -25.1501701
-                    ],
+                        -3.29273129,
+                        57.62924695
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/elgin.html",
+            "terms_text": "National Library of Scotland - Elgin 1868"
+        },
+        {
+            "name": "OS Town Plans, Falkirk 1858-1859 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Falkirk 1858-1859, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/falkirk/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        20.6532441,
-                        -25.4529449
+                        -3.79587441,
+                        55.99343101
                     ],
                     [
-                        20.733265,
-                        -25.6801957
+                        -3.79697783,
+                        56.01720281
                     ],
                     [
-                        20.8281046,
-                        -25.8963498
+                        -3.76648151,
+                        56.01764348
                     ],
                     [
-                        20.8429232,
-                        -26.215851
-                    ],
+                        -3.76539679,
+                        55.99387129
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/falkirk.html",
+            "terms_text": "National Library of Scotland - Falkirk 1858-1859"
+        },
+        {
+            "name": "OS Town Plans, Forfar 1860-1861 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Forfar 1860-1861, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/forfar/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        20.6502804,
-                        -26.4840868
+                        -2.90326183,
+                        56.6289471
                     ],
                     [
-                        20.6532441,
-                        -26.8204869
+                        -2.90378797,
+                        56.65095013
                     ],
                     [
-                        21.0889134,
-                        -26.846933
+                        -2.87228457,
+                        56.65117489
                     ],
                     [
-                        21.6727695,
-                        -26.8389998
-                    ],
+                        -2.87177676,
+                        56.62917168
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/forfar.html",
+            "terms_text": "National Library of Scotland - Forfar 1860-1861"
+        },
+        {
+            "name": "OS Town Plans, Forres 1868 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Forres 1868, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/forres/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        21.7765003,
-                        -26.6696268
+                        -3.63516795,
+                        57.58887872
                     ],
                     [
-                        21.9721069,
-                        -26.6431395
+                        -3.63647637,
+                        57.618002
                     ],
                     [
-                        22.2803355,
-                        -26.3274702
+                        -3.57751453,
+                        57.61875171
                     ],
                     [
-                        22.5707817,
-                        -26.1333967
-                    ],
+                        -3.5762532,
+                        57.58962759
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/forres.html",
+            "terms_text": "National Library of Scotland - Forres 1868"
+        },
+        {
+            "name": "OS Town Plans, Galashiels 1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Galashiels 1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/galashiels/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        22.7752795,
-                        -25.6775246
+                        -2.82918609,
+                        55.59586303
                     ],
                     [
-                        23.0005235,
-                        -25.2761948
+                        -2.82981273,
+                        55.62554026
                     ],
                     [
-                        23.4658301,
-                        -25.2735148
+                        -2.78895254,
+                        55.62580992
                     ],
                     [
-                        23.883717,
-                        -25.597366
-                    ],
+                        -2.78835674,
+                        55.59613239
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/galashiels.html",
+            "terms_text": "National Library of Scotland - Galashiels 1858"
+        },
+        {
+            "name": "OS Town Plans, Girvan 1857 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Girvan 1857, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/girvan/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        24.2364017,
-                        -25.613402
+                        -4.87424251,
+                        55.22679729
                     ],
                     [
-                        24.603905,
-                        -25.7896563
+                        -4.87587895,
+                        55.24945946
                     ],
                     [
-                        25.110704,
-                        -25.7389432
+                        -4.84447382,
+                        55.25019598
                     ],
                     [
-                        25.5078447,
-                        -25.6855376
-                    ],
-                    [
-                        25.6441766,
-                        -25.4823781
-                    ],
+                        -4.84285519,
+                        55.22753318
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/girvan.html",
+            "terms_text": "National Library of Scotland - Girvan 1857"
+        },
+        {
+            "name": "OS Town Plans, Glasgow 1857-1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Glasgow 1857-1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/glasgow1857/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        25.8419267,
-                        -24.7805437
+                        -4.31575491,
+                        55.82072009
                     ],
                     [
-                        25.846641,
-                        -24.7538456
+                        -4.319683,
+                        55.88667625
                     ],
                     [
-                        26.3928487,
-                        -24.6332894
+                        -4.1771319,
+                        55.88928081
                     ],
                     [
-                        26.4739066,
-                        -24.5653312
-                    ],
+                        -4.1734447,
+                        55.82331825
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/glasgow_1.html",
+            "terms_text": "National Library of Scotland - Glasgow 1857-1858"
+        },
+        {
+            "name": "OS Town Plans, Glasgow 1892-1894 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Glasgow 1892-1894, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/glasgow1894/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        26.5089966,
-                        -24.4842437
+                        -4.3465357,
+                        55.81456228
                     ],
                     [
-                        26.5861946,
-                        -24.4075775
+                        -4.35157646,
+                        55.89806268
                     ],
                     [
-                        26.7300635,
-                        -24.3014458
+                        -4.17788765,
+                        55.9012587
                     ],
                     [
-                        26.8567384,
-                        -24.2499463
-                    ],
+                        -4.17321842,
+                        55.81774834
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/glasgow_2.html",
+            "terms_text": "National Library of Scotland - Glasgow 1892-1894"
+        },
+        {
+            "name": "OS Town Plans, Greenock 1857 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Greenock 1857, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/greenock/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        26.8574402,
-                        -24.1026901
+                        -4.78108857,
+                        55.92617865
                     ],
                     [
-                        26.9215471,
-                        -23.8990957
+                        -4.78382957,
+                        55.96437481
                     ],
                     [
-                        26.931831,
-                        -23.8461891
+                        -4.7302257,
+                        55.96557475
                     ],
                     [
-                        26.9714827,
-                        -23.6994344
-                    ],
+                        -4.72753731,
+                        55.92737687
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/greenock.html",
+            "terms_text": "National Library of Scotland - Greenock 1857"
+        },
+        {
+            "name": "OS Town Plans, Haddington 1853 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Haddington 1853, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/haddington1853/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        27.0006074,
-                        -23.6367644
+                        -2.78855542,
+                        55.9451862
                     ],
                     [
-                        27.0578041,
-                        -23.6052574
+                        -2.78888196,
+                        55.96124194
                     ],
                     [
-                        27.1360547,
-                        -23.5203437
+                        -2.76674325,
+                        55.9613817
                     ],
                     [
-                        27.3339623,
-                        -23.3973792
-                    ],
+                        -2.76642588,
+                        55.94532587
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/haddington_1.html",
+            "terms_text": "National Library of Scotland - Haddington 1853"
+        },
+        {
+            "name": "OS Town Plans, Haddington 1893 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Haddington 1893, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/haddington1893/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        27.5144057,
-                        -23.3593929
+                        -2.80152293,
+                        55.93428734
                     ],
                     [
-                        27.5958145,
-                        -23.2085465
+                        -2.80214693,
+                        55.96447189
                     ],
                     [
-                        27.8098634,
-                        -23.0994957
+                        -2.76038069,
+                        55.9647367
                     ],
                     [
-                        27.8828506,
-                        -23.0620496
-                    ],
+                        -2.75978916,
+                        55.93455185
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/haddington_2.html",
+            "terms_text": "National Library of Scotland - Haddington 1893"
+        },
+        {
+            "name": "OS Town Plans, Hamilton 1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Hamilton 1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/hamilton/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        27.9382928,
-                        -22.9496487
+                        -4.06721642,
+                        55.74877265
                     ],
                     [
-                        28.0407556,
-                        -22.8255118
+                        -4.06924047,
+                        55.78698508
                     ],
                     [
-                        28.2056786,
-                        -22.6552861
+                        -4.01679233,
+                        55.78785698
                     ],
                     [
-                        28.3397223,
-                        -22.5639374
-                    ],
+                        -4.01481949,
+                        55.74964331
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/hamilton.html",
+            "terms_text": "National Library of Scotland - Hamilton 1858"
+        },
+        {
+            "name": "OS Town Plans, Hawick 1857-1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Hawick 1857-1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/hawick/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        28.4906093,
-                        -22.560697
+                        -2.80130149,
+                        55.4102516
                     ],
                     [
-                        28.6108769,
-                        -22.5400248
+                        -2.80176329,
+                        55.43304638
                     ],
                     [
-                        28.828175,
-                        -22.4550173
+                        -2.7708832,
+                        55.43324489
                     ],
                     [
-                        28.9285324,
-                        -22.4232328
-                    ],
+                        -2.77043917,
+                        55.41044995
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/hawick.html",
+            "terms_text": "National Library of Scotland - Hawick 1857-1858"
+        },
+        {
+            "name": "OS Town Plans, Inverness 1867-1868 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Inverness 1867-1868, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/inverness/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        28.9594116,
-                        -22.3090081
+                        -4.25481758,
+                        57.45916363
                     ],
                     [
-                        29.0162574,
-                        -22.208335
+                        -4.25752308,
+                        57.50302387
                     ],
                     [
-                        29.2324117,
-                        -22.1693453
+                        -4.19713638,
+                        57.50409032
                     ],
                     [
-                        29.3531213,
-                        -22.1842926
-                    ],
+                        -4.1945031,
+                        57.46022829
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/inverness.html",
+            "terms_text": "National Library of Scotland - Inverness 1867-1868"
+        },
+        {
+            "name": "OS Town Plans, Irvine 1859 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Irvine 1859, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/irvine/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        29.6548952,
-                        -22.1186426
+                        -4.67540402,
+                        55.60649957
                     ],
                     [
-                        29.7777102,
-                        -22.1361956
+                        -4.67643252,
+                        55.62159024
                     ],
                     [
-                        29.9292989,
-                        -22.1849425
+                        -4.65537888,
+                        55.62204812
                     ],
                     [
-                        30.1166795,
-                        -22.2830348
-                    ],
+                        -4.65435844,
+                        55.60695719
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/irvine.html",
+            "terms_text": "National Library of Scotland - Irvine 1859"
+        },
+        {
+            "name": "OS Town Plans, Jedburgh 1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Jedburgh 1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/jedburgh/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        30.2563377,
-                        -22.2914767
+                        -2.56332521,
+                        55.47105448
                     ],
                     [
-                        30.3033582,
-                        -22.3395204
+                        -2.56355503,
+                        55.48715562
                     ],
                     [
-                        30.5061784,
-                        -22.3057617
+                        -2.54168193,
+                        55.48725438
                     ],
                     [
-                        30.8374279,
-                        -22.284983
-                    ],
+                        -2.54146103,
+                        55.47115318
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/jedburgh.html",
+            "terms_text": "National Library of Scotland - Jedburgh 1858"
+        },
+        {
+            "name": "OS Town Plans, Kelso 1857 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Kelso 1857, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/kelso/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        31.0058599,
-                        -22.3077095
+                        -2.44924544,
+                        55.58390848
                     ],
                     [
-                        31.1834152,
-                        -22.3232913
+                        -2.44949757,
+                        55.6059582
                     ],
                     [
-                        31.2930586,
-                        -22.3674647
+                        -2.41902085,
+                        55.60606617
                     ],
                     [
-                        31.5680579,
-                        -23.1903385
-                    ],
+                        -2.41878581,
+                        55.58401636
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/kelso.html",
+            "terms_text": "National Library of Scotland - Kelso 1857"
+        },
+        {
+            "name": "OS Town Plans, Kilmarnock 1857-1859 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Kilmarnock 1857-1859, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/kilmarnock/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        31.5568311,
-                        -23.4430809
+                        -4.51746876,
+                        55.58950933
                     ],
                     [
-                        31.6931122,
-                        -23.6175209
+                        -4.5194347,
+                        55.62017114
                     ],
                     [
-                        31.7119696,
-                        -23.741136
+                        -4.47675652,
+                        55.62104083
                     ],
                     [
-                        31.7774743,
-                        -23.8800628
-                    ],
+                        -4.4748238,
+                        55.59037802
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/kilmarnock.html",
+            "terms_text": "National Library of Scotland - Kilmarnock 1857-1859"
+        },
+        {
+            "name": "OS Town Plans, Kirkcaldy 1855 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Kirkcaldy 1855, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/kirkcaldy1855/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        31.8886337,
-                        -23.9481098
+                        -3.17455285,
+                        56.09518942
                     ],
                     [
-                        31.9144386,
-                        -24.1746736
+                        -3.17554995,
+                        56.12790251
                     ],
                     [
-                        31.9948307,
-                        -24.3040878
+                        -3.12991402,
+                        56.12832843
                     ],
                     [
-                        32.0166656,
-                        -24.4405988
-                    ],
+                        -3.12895559,
+                        56.09561481
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/kirkcaldy_1.html",
+            "terms_text": "National Library of Scotland - Kirkcaldy 1855"
+        },
+        {
+            "name": "OS Town Plans, Kirkcaldy 1894 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Kirkcaldy 1894, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/kirkcaldy1894/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        32.0077331,
-                        -24.6536578
+                        -3.17460426,
+                        56.09513375
                     ],
                     [
-                        32.019643,
-                        -24.9140701
+                        -3.17560428,
+                        56.12794116
                     ],
                     [
-                        32.035523,
-                        -25.0849767
+                        -3.12989512,
+                        56.12836777
                     ],
                     [
-                        32.019643,
-                        -25.3821442
-                    ],
+                        -3.12893395,
+                        56.09555983
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/kirkcaldy_2.html",
+            "terms_text": "National Library of Scotland - Kirkcaldy 1894"
+        },
+        {
+            "name": "OS Town Plans, Kirkcudbright 1850 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Kirkcudbright 1850, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/kirkcudbright1850/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        31.9928457,
-                        -25.4493771
+                        -4.06154334,
+                        54.82586314
                     ],
                     [
-                        31.9997931,
-                        -25.5165725
+                        -4.0623081,
+                        54.84086061
                     ],
                     [
-                        32.0057481,
-                        -25.6078978
+                        -4.0420219,
+                        54.84120364
                     ],
                     [
-                        32.0057481,
-                        -25.6624806
-                    ],
+                        -4.04126464,
+                        54.82620598
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/kirkcudbright_1.html",
+            "terms_text": "National Library of Scotland - Kirkcudbright 1850"
+        },
+        {
+            "name": "OS Town Plans, Kirkcudbright 1893 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Kirkcudbright 1893, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/kirkcudbright1893/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        31.9362735,
-                        -25.8403721
+                        -4.06001868,
+                        54.82720122
                     ],
                     [
-                        31.9809357,
-                        -25.9546537
+                        -4.06079036,
+                        54.84234455
                     ],
                     [
-                        31.8687838,
-                        -26.0037251
+                        -4.04025067,
+                        54.84269158
                     ],
                     [
-                        31.4162062,
-                        -25.7277683
-                    ],
+                        -4.03948667,
+                        54.82754805
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/kirkcudbright_2.html",
+            "terms_text": "National Library of Scotland - Kirkcudbright 1893"
+        },
+        {
+            "name": "OS Town Plans, Kirkintilloch 1859 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Kirkintilloch 1859, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/kirkintilloch/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        31.3229117,
-                        -25.7438611
+                        -4.16664222,
+                        55.93124287
                     ],
                     [
-                        31.2504595,
-                        -25.8296526
+                        -4.16748402,
+                        55.94631265
                     ],
                     [
-                        31.1393001,
-                        -25.9162746
+                        -4.14637318,
+                        55.94668235
                     ],
                     [
-                        31.1164727,
-                        -25.9912361
-                    ],
+                        -4.14553956,
+                        55.93161237
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/kirkintilloch.html",
+            "terms_text": "National Library of Scotland - Kirkintilloch 1859"
+        },
+        {
+            "name": "OS Town Plans, Kirriemuir 1861 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Kirriemuir 1861, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/kirriemuir/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        30.9656135,
-                        -26.2665756
+                        -3.01255744,
+                        56.65896044
                     ],
                     [
-                        30.8921689,
-                        -26.3279703
+                        -3.01302683,
+                        56.67645382
                     ],
                     [
-                        30.8534616,
-                        -26.4035568
+                        -2.98815879,
+                        56.67665366
                     ],
                     [
-                        30.8226943,
-                        -26.4488849
-                    ],
+                        -2.98770092,
+                        56.65916014
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/kirriemuir.html",
+            "terms_text": "National Library of Scotland - Kirriemuir 1861"
+        },
+        {
+            "name": "OS Town Plans, Lanark 1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Lanark 1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/lanark/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        30.8022583,
-                        -26.5240694
+                        -3.78642584,
+                        55.66308804
                     ],
                     [
-                        30.8038369,
-                        -26.8082089
+                        -3.78710605,
+                        55.67800854
                     ],
                     [
-                        30.9020939,
-                        -26.7807451
+                        -3.76632876,
+                        55.67830935
                     ],
                     [
-                        30.9100338,
-                        -26.8489495
-                    ],
+                        -3.76565645,
+                        55.66338868
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/lanark.html",
+            "terms_text": "National Library of Scotland - Lanark 1858"
+        },
+        {
+            "name": "OS Town Plans, Linlithgow 1856 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Linlithgow 1856, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/linlithgow/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        30.9824859,
-                        -26.9082627
+                        -3.61908334,
+                        55.95549561
                     ],
                     [
-                        30.976531,
-                        -27.0029222
+                        -3.62033259,
+                        55.98538615
                     ],
                     [
-                        31.0034434,
-                        -27.0441587
+                        -3.57838447,
+                        55.98593047
                     ],
                     [
-                        31.1543322,
-                        -27.1980416
-                    ],
+                        -3.57716753,
+                        55.95603932
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/linlithgow.html",
+            "terms_text": "National Library of Scotland - Linlithgow 1856"
+        },
+        {
+            "name": "OS Town Plans, Mayole 1856-1857 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Mayole 1856-1857, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/maybole/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        31.5015607,
-                        -27.311117
+                        -4.69086378,
+                        55.34340178
                     ],
                     [
-                        31.9700183,
-                        -27.311117
+                        -4.6918884,
+                        55.35849731
                     ],
                     [
-                        31.9700183,
-                        -27.120472
+                        -4.67089656,
+                        55.35895813
                     ],
                     [
-                        31.9769658,
-                        -27.050664
-                    ],
+                        -4.6698799,
+                        55.34386234
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/maybole.html",
+            "terms_text": "National Library of Scotland - Mayole 1856-1857"
+        },
+        {
+            "name": "OS Town Plans, Montrose 1861-1862 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Montrose 1861-1862, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/montrose/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        32.0002464,
-                        -26.7983892
+                        -2.4859324,
+                        56.69645192
                     ],
                     [
-                        32.1069826,
-                        -26.7984645
+                        -2.4862257,
+                        56.71918799
                     ],
                     [
-                        32.3114546,
-                        -26.8479493
+                        -2.45405417,
+                        56.71930941
                     ],
                     [
-                        32.899986,
-                        -26.8516059
-                    ],
+                        -2.45378027,
+                        56.69657324
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/montrose.html",
+            "terms_text": "National Library of Scotland - Montrose 1861-1862"
+        },
+        {
+            "name": "OS Town Plans, Musselburgh 1853 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Musselburgh 1853, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/musselburgh1853/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        32.886091,
-                        -26.9816971
+                        -3.07888558,
+                        55.93371953
                     ],
                     [
-                        32.709427,
-                        -27.4785436
+                        -3.07954151,
+                        55.95729781
                     ],
                     [
-                        32.6240724,
-                        -27.7775144
+                        -3.03240684,
+                        55.95770177
                     ],
                     [
-                        32.5813951,
-                        -28.07479
-                    ],
+                        -3.03177952,
+                        55.93412313
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/musselburgh_1.html",
+            "terms_text": "National Library of Scotland - Musselburgh 1853"
+        },
+        {
+            "name": "OS Town Plans, Musselburgh 1893 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Musselburgh 1893, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/musselburgh1893/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        32.5387178,
-                        -28.2288046
+                        -3.07017621,
+                        55.92694102
                     ],
                     [
-                        32.4275584,
-                        -28.5021568
+                        -3.07078961,
+                        55.94917624
                     ],
                     [
-                        32.3640388,
-                        -28.5945699
+                        -3.03988228,
+                        55.94944099
                     ],
                     [
-                        32.0702603,
-                        -28.8469827
-                    ],
+                        -3.03928658,
+                        55.92720556
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/musselburgh_2.html",
+            "terms_text": "National Library of Scotland - Musselburgh 1893"
+        },
+        {
+            "name": "OS Town Plans, Nairn 1867-1868 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Nairn 1867-1868, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/nairn/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        31.9878832,
-                        -28.9069497
+                        -3.88433907,
+                        57.57899149
                     ],
                     [
-                        31.7764818,
-                        -28.969487
+                        -3.88509905,
+                        57.5936822
                     ],
                     [
-                        31.4638459,
-                        -29.2859343
+                        -3.85931017,
+                        57.59406441
                     ],
                     [
-                        31.359634,
-                        -29.3854348
-                    ],
+                        -3.85856057,
+                        57.57937348
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/nairn.html",
+            "terms_text": "National Library of Scotland - Nairn 1867-1868"
+        },
+        {
+            "name": "OS Town Plans, Oban 1867-1868 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Oban 1867-1868, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/oban/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        31.1680825,
-                        -29.6307408
+                        -5.49548449,
+                        56.39080407
                     ],
                     [
-                        31.064863,
-                        -29.7893535
+                        -5.49836627,
+                        56.42219039
                     ],
                     [
-                        31.0534493,
-                        -29.8470469
+                        -5.45383984,
+                        56.42343933
                     ],
                     [
-                        31.0669933,
-                        -29.8640319
-                    ],
+                        -5.45099456,
+                        56.39205153
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/oban.html",
+            "terms_text": "National Library of Scotland - Oban 1867-1868"
+        },
+        {
+            "name": "OS Town Plans, Peebles 1856 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Peebles 1856, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/peebles/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        31.0455459,
-                        -29.9502017
+                        -3.20921287,
+                        55.63635834
                     ],
                     [
-                        30.9518556,
-                        -30.0033946
+                        -3.20990288,
+                        55.65873817
                     ],
                     [
-                        30.8651833,
-                        -30.1024093
+                        -3.17896372,
+                        55.65903935
                     ],
                     [
-                        30.7244725,
-                        -30.392502
-                    ],
+                        -3.17829135,
+                        55.63665927
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/peebles.html",
+            "terms_text": "National Library of Scotland - Peebles 1856"
+        },
+        {
+            "name": "OS Town Plans, Perth 1860 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Perth 1860, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/perth/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        30.3556256,
-                        -30.9308873
+                        -3.45302495,
+                        56.37794226
                     ],
                     [
-                        30.0972364,
-                        -31.2458274
+                        -3.45416664,
+                        56.40789908
                     ],
                     [
-                        29.8673136,
-                        -31.4304296
+                        -3.41187528,
+                        56.40838777
                     ],
                     [
-                        29.7409393,
-                        -31.5014699
-                    ],
+                        -3.41076676,
+                        56.3784304
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/perth.html",
+            "terms_text": "National Library of Scotland - Perth 1860"
+        },
+        {
+            "name": "OS Town Plans, Peterhead 1868 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Peterhead 1868, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/peterhead/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        29.481312,
-                        -31.6978686
+                        -1.80513747,
+                        57.48046916
                     ],
                     [
-                        28.8943171,
-                        -32.2898903
+                        -1.80494005,
+                        57.51755411
                     ],
                     [
-                        28.5497137,
-                        -32.5894641
+                        -1.75135366,
+                        57.51746003
                     ],
                     [
-                        28.1436499,
-                        -32.8320732
-                    ],
+                        -1.75160539,
+                        57.48037522
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/peterhead",
+            "terms_text": "National Library of Scotland - Peterhead 1868"
+        },
+        {
+            "name": "OS Town Plans, Port Glasgow 1856-1857 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Port Glasgow 1856-1857, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/portglasgow/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        28.0748735,
-                        -32.941689
+                        -4.70063209,
+                        55.91995983
                     ],
                     [
-                        27.8450942,
-                        -33.082869
+                        -4.70222026,
+                        55.9427679
                     ],
                     [
-                        27.3757956,
-                        -33.3860685
+                        -4.67084958,
+                        55.94345237
                     ],
                     [
-                        26.8805407,
-                        -33.6458951
-                    ],
+                        -4.6692798,
+                        55.92064372
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/port-glasgow.html",
+            "terms_text": "National Library of Scotland - Port Glasgow 1856-1857"
+        },
+        {
+            "name": "OS Town Plans, Portobello 1893-1894 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Portobello 1893-1894, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/portobello/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        26.5916871,
-                        -33.7480756
+                        -3.12437919,
+                        55.93846889
                     ],
                     [
-                        26.4527308,
-                        -33.7935795
+                        -3.1250234,
+                        55.96068605
                     ],
                     [
-                        26.206754,
-                        -33.7548943
+                        -3.09394827,
+                        55.96096586
                     ],
                     [
-                        26.0077897,
-                        -33.7223961
-                    ],
+                        -3.09332184,
+                        55.93874847
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/portobello.html",
+            "terms_text": "National Library of Scotland - Portobello 1893-1894"
+        },
+        {
+            "name": "OS Town Plans, Rothesay 1862-1863 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Rothesay 1862-1863, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/rothesay/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        25.8055494,
-                        -33.7524272
+                        -5.06449893,
+                        55.82864114
                     ],
                     [
-                        25.7511073,
-                        -33.8006512
+                        -5.06569719,
+                        55.84385927
                     ],
                     [
-                        25.6529079,
-                        -33.8543597
+                        -5.04413114,
+                        55.84439519
                     ],
                     [
-                        25.6529079,
-                        -33.9469768
-                    ],
+                        -5.04294127,
+                        55.82917676
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/rothesay.html",
+            "terms_text": "National Library of Scotland - Rothesay 1862-1863"
+        },
+        {
+            "name": "OS Town Plans, Selkirk 1865 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Selkirk 1865, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/selkirk/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        25.7195789,
-                        -34.0040115
+                        -2.85998582,
+                        55.53499576
                     ],
                     [
-                        25.7202807,
-                        -34.0511235
+                        -2.86063259,
+                        55.56459732
                     ],
                     [
-                        25.5508915,
-                        -34.063151
+                        -2.82003242,
+                        55.56487574
                     ],
                     [
-                        25.3504571,
-                        -34.0502627
-                    ],
+                        -2.81941615,
+                        55.53527387
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/selkirk.html",
+            "terms_text": "National Library of Scotland - Selkirk 1865"
+        },
+        {
+            "name": "OS Town Plans, St Andrews 1854 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of St Andrews 1854, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/standrews1854/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        25.2810609,
-                        -34.0020322
+                        -2.81342686,
+                        56.32097352
                     ],
                     [
-                        25.0476316,
-                        -33.9994588
+                        -2.81405804,
+                        56.3506222
                     ],
                     [
-                        24.954724,
-                        -34.0043594
+                        -2.77243712,
+                        56.35088865
                     ],
                     [
-                        24.9496586,
-                        -34.1010363
-                    ],
+                        -2.77183819,
+                        56.32123967
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/st-andrews_1.html",
+            "terms_text": "National Library of Scotland - St Andrews 1854"
+        },
+        {
+            "name": "OS Town Plans, St Andrews 1893 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of St Andrews 1893, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/standrews1893/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        24.8770358,
-                        -34.1506456
+                        -2.81545583,
+                        56.31861733
                     ],
                     [
-                        24.8762914,
-                        -34.2005281
+                        -2.81609919,
+                        56.3487653
                     ],
                     [
-                        24.8532574,
-                        -34.2189562
+                        -2.77387785,
+                        56.34903619
                     ],
                     [
-                        24.7645287,
-                        -34.2017946
-                    ],
+                        -2.77326775,
+                        56.31888792
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/st-andrews_2.html",
+            "terms_text": "National Library of Scotland - St Andrews 1893"
+        },
+        {
+            "name": "OS Town Plans, Stirling 1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Stirling 1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/stirling/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        24.5001356,
-                        -34.2003254
+                        -3.95768489,
+                        56.10754239
                     ],
                     [
-                        24.3486733,
-                        -34.1163824
+                        -3.95882978,
+                        56.13007142
                     ],
                     [
-                        24.1988819,
-                        -34.1019039
+                        -3.92711024,
+                        56.13057046
                     ],
                     [
-                        23.9963377,
-                        -34.0514443
-                    ],
+                        -3.92598386,
+                        56.10804101
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/stirling.html",
+            "terms_text": "National Library of Scotland - Stirling 1858"
+        },
+        {
+            "name": "OS Town Plans, Stonehaven 1864 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Stonehaven 1864, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/stonehaven/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        23.8017509,
-                        -34.0524332
+                        -2.220167,
+                        56.9565098
                     ],
                     [
-                        23.7493589,
-                        -34.0111855
+                        -2.2202543,
+                        56.97129283
                     ],
                     [
-                        23.4973536,
-                        -34.009014
+                        -2.19924399,
+                        56.9713281
                     ],
                     [
-                        23.4155191,
-                        -34.0434586
-                    ],
+                        -2.19916501,
+                        56.95654504
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/stonehaven.html",
+            "terms_text": "National Library of Scotland - Stonehaven 1864"
+        },
+        {
+            "name": "OS Town Plans, Stranraer 1847 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Stranraer 1847, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/stranraer1847/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        23.4154284,
-                        -34.1140433
+                        -5.04859743,
+                        54.8822997
                     ],
                     [
-                        22.9000853,
-                        -34.0993009
+                        -5.0508954,
+                        54.91268061
                     ],
                     [
-                        22.8412418,
-                        -34.0547911
+                        -5.0095373,
+                        54.91371278
                     ],
                     [
-                        22.6470321,
-                        -34.0502627
-                    ],
+                        -5.00727037,
+                        54.88333071
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/stranraer_1.html",
+            "terms_text": "National Library of Scotland - Stranraer 1847"
+        },
+        {
+            "name": "OS Town Plans, Stranraer 1863-1877 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Stranraer 1863-1877, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/stranraer1867/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        22.6459843,
-                        -34.0072768
+                        -5.04877289,
+                        54.88228699
                     ],
                     [
-                        22.570016,
-                        -34.0064081
+                        -5.05107324,
+                        54.9126976
                     ],
                     [
-                        22.5050499,
-                        -34.0645866
+                        -5.00947337,
+                        54.91373582
                     ],
                     [
-                        22.2519968,
-                        -34.0645866
-                    ],
+                        -5.00720427,
+                        54.88332405
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/stranraer_1a.html",
+            "terms_text": "National Library of Scotland - Stranraer 1863-1877"
+        },
+        {
+            "name": "OS Town Plans, Stranraer 1893 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Stranraer 1893, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/stranraer1893/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        22.2221334,
-                        -34.1014701
+                        -5.04418424,
+                        54.89773858
                     ],
                     [
-                        22.1621197,
-                        -34.1057019
+                        -5.04511026,
+                        54.90999885
                     ],
                     [
-                        22.1712431,
-                        -34.1521766
+                        -5.0140499,
+                        54.91077389
                     ],
                     [
-                        22.1576913,
-                        -34.2180897
-                    ],
+                        -5.0131333,
+                        54.89851327
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/stranraer_2.html",
+            "terms_text": "National Library of Scotland - Stranraer 1893"
+        },
+        {
+            "name": "OS Town Plans, Strathaven 1858 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Strathaven 1858, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/strathaven/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        22.0015632,
-                        -34.2172232
+                        -4.06914872,
+                        55.67242091
                     ],
                     [
-                        21.9496952,
-                        -34.3220009
+                        -4.06954357,
+                        55.67989707
                     ],
                     [
-                        21.8611528,
-                        -34.4007145
+                        -4.05917487,
+                        55.6800715
                     ],
                     [
-                        21.5614708,
-                        -34.4020114
-                    ],
+                        -4.05878199,
+                        55.67259529
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/strathaven.html",
+            "terms_text": "National Library of Scotland - Strathaven 1858"
+        },
+        {
+            "name": "OS Town Plans, Wick 1872 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Wick 1872, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/wick/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        21.5468011,
-                        -34.3661242
+                        -3.11470001,
+                        58.41344839
                     ],
                     [
-                        21.501744,
-                        -34.3669892
+                        -3.11588837,
+                        58.45101446
                     ],
                     [
-                        21.5006961,
-                        -34.4020114
+                        -3.05949843,
+                        58.45149284
                     ],
                     [
-                        21.4194886,
-                        -34.4465247
-                    ],
+                        -3.05837008,
+                        58.41392606
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/wick.html",
+            "terms_text": "National Library of Scotland - Wick 1872"
+        },
+        {
+            "name": "OS Town Plans, Wigtown 1848 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Wigtown 1848, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/wigtown1848/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        21.1978706,
-                        -34.4478208
+                        -4.45235587,
+                        54.8572296
                     ],
                     [
-                        21.0988193,
-                        -34.3991325
+                        -4.45327284,
+                        54.87232603
                     ],
                     [
-                        21.0033746,
-                        -34.3753872
+                        -4.43254469,
+                        54.87274317
                     ],
                     [
-                        20.893192,
-                        -34.3997115
-                    ],
+                        -4.43163545,
+                        54.85764651
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/wigtown_1.html",
+            "terms_text": "National Library of Scotland - Wigtown 1848"
+        },
+        {
+            "name": "OS Town Plans, Wigtown 1894 (NLS)",
+            "type": "tms",
+            "description": "Detailed town plan of Wigtown 1894, courtesy of National Library of Scotland.",
+            "template": "http://geo.nls.uk/maps/towns/wigtown1894/{zoom}/{x}/{-y}.png",
+            "scaleExtent": [
+                13,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        20.8976647,
-                        -34.4854003
+                        -4.45233361,
+                        54.85721131
                     ],
                     [
-                        20.7446802,
-                        -34.4828092
+                        -4.45325423,
+                        54.87236807
                     ],
                     [
-                        20.5042011,
-                        -34.486264
+                        -4.43257837,
+                        54.87278416
                     ],
                     [
-                        20.2527197,
-                        -34.701477
+                        -4.43166549,
+                        54.85762716
+                    ]
+                ]
+            ],
+            "terms_url": "http://maps.nls.uk/townplans/wigtown_2.html",
+            "terms_text": "National Library of Scotland - Wigtown 1894"
+        },
+        {
+            "name": "OpenPT Map (overlay)",
+            "type": "tms",
+            "template": "http://openptmap.de/tiles/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                5,
+                16
+            ],
+            "polygon": [
+                [
+                    [
+                        6.4901072,
+                        53.665658
                     ],
                     [
-                        20.0803502,
-                        -34.8361855
+                        8.5665347,
+                        53.9848257
                     ],
                     [
-                        19.9923317,
-                        -34.8379056
+                        8.1339457,
+                        54.709715
                     ],
                     [
-                        19.899074,
-                        -34.8275845
+                        8.317796,
+                        55.0952362
                     ],
                     [
-                        19.8938348,
-                        -34.7936018
+                        10.1887438,
+                        54.7783834
                     ],
                     [
-                        19.5972963,
-                        -34.7961833
-                    ],
-                    [
-                        19.3929677,
-                        -34.642015
-                    ],
-                    [
-                        19.2877095,
-                        -34.6404784
-                    ],
-                    [
-                        19.2861377,
-                        -34.5986563
-                    ],
-                    [
-                        19.3474363,
-                        -34.5244458
-                    ],
-                    [
-                        19.3285256,
-                        -34.4534372
-                    ],
-                    [
-                        19.098001,
-                        -34.449981
+                        10.6321475,
+                        54.4778841
                     ],
                     [
-                        19.0725583,
-                        -34.3802371
+                        11.2702164,
+                        54.6221504
                     ],
                     [
-                        19.0023531,
-                        -34.3525593
+                        11.681176,
+                        54.3709243
                     ],
                     [
-                        18.9520568,
-                        -34.3949373
+                        12.0272473,
+                        54.3898199
                     ],
                     [
-                        18.7975006,
-                        -34.3936403
+                        13.3250145,
+                        54.8531617
                     ],
                     [
-                        18.7984174,
-                        -34.1016376
+                        13.9198245,
+                        54.6972173
                     ],
                     [
-                        18.501748,
-                        -34.1015292
+                        14.2118221,
+                        54.1308273
                     ],
                     [
-                        18.4999545,
-                        -34.3616945
+                        14.493005,
+                        53.2665063
                     ],
                     [
-                        18.4477325,
-                        -34.3620007
+                        14.1577485,
+                        52.8766495
                     ],
                     [
-                        18.4479944,
-                        -34.3522691
+                        14.7525584,
+                        52.5819369
                     ],
                     [
-                        18.3974362,
-                        -34.3514041
+                        15.0986297,
+                        51.0171541
                     ],
                     [
-                        18.3971742,
-                        -34.3022959
+                        14.9364088,
+                        50.8399279
                     ],
                     [
-                        18.3565705,
-                        -34.3005647
+                        14.730929,
+                        50.7920977
                     ],
                     [
-                        18.3479258,
-                        -34.2020436
+                        14.4389313,
+                        50.8808862
                     ],
                     [
-                        18.2972095,
-                        -34.1950274
+                        12.9573138,
+                        50.3939044
                     ],
                     [
-                        18.2951139,
-                        -33.9937138
+                        12.51391,
+                        50.3939044
                     ],
                     [
-                        18.3374474,
-                        -33.9914079
+                        12.3084302,
+                        50.1173237
                     ],
                     [
-                        18.3476638,
-                        -33.8492427
+                        12.6112425,
+                        49.9088337
                     ],
                     [
-                        18.3479258,
-                        -33.781555
+                        12.394948,
+                        49.7344006
                     ],
                     [
-                        18.4124718,
-                        -33.7448849
+                        12.7734634,
+                        49.4047626
                     ],
                     [
-                        18.3615477,
-                        -33.6501624
+                        14.1469337,
+                        48.6031036
                     ],
                     [
-                        18.2992013,
-                        -33.585591
+                        14.6768553,
+                        48.6531391
                     ],
                     [
-                        18.2166839,
-                        -33.448872
+                        15.0661855,
+                        49.0445497
                     ],
                     [
-                        18.1389858,
-                        -33.3974083
+                        16.2666202,
+                        48.7459305
                     ],
                     [
-                        17.9473472,
-                        -33.1602647
+                        16.4937294,
+                        48.8741286
                     ],
                     [
-                        17.8855247,
-                        -33.0575732
+                        16.904689,
+                        48.7173975
                     ],
                     [
-                        17.8485884,
-                        -32.9668505
+                        16.9371332,
+                        48.5315383
                     ],
                     [
-                        17.8396817,
-                        -32.8507302
-                    ]
-                ]
-            ]
-        },
-        {
-            "name": "South Tyrol Orthofoto 2011",
-            "type": "tms",
-            "template": "http://sdi.provincia.bz.it/geoserver/gwc/service/tms/1.0.0/WMTS_OF2011_APB-PAB@GoogleMapsCompatible@png8/{z}/{x}/{-y}.png",
-            "polygon": [
-                [
-                    [
-                        10.373383,
-                        46.213553
+                        16.8384693,
+                        48.3823161
                     ],
                     [
-                        10.373383,
-                        47.098175
+                        17.2017097,
+                        48.010204
                     ],
                     [
-                        12.482758,
-                        47.098175
+                        17.1214145,
+                        47.6997605
                     ],
                     [
-                        12.482758,
-                        46.213553
+                        16.777292,
+                        47.6585709
                     ],
                     [
-                        10.373383,
-                        46.213553
-                    ]
-                ]
-            ],
-            "id": "sdi.provinz.bz.it-WMTS_OF2011_APB-PAB"
-        },
-        {
-            "name": "South Tyrol Topomap",
-            "type": "tms",
-            "template": "http://sdi.provincia.bz.it/geoserver/gwc/service/tms/1.0.0/WMTS_TOPOMAP_APB-PAB@GoogleMapsCompatible@png8/{z}/{x}/{-y}.png",
-            "polygon": [
-                [
-                    [
-                        10.373383,
-                        46.213553
+                        16.6090543,
+                        47.7460598
                     ],
                     [
-                        10.373383,
-                        47.098175
+                        16.410228,
+                        47.6637214
                     ],
                     [
-                        12.482758,
-                        47.098175
+                        16.7352326,
+                        47.6147714
                     ],
                     [
-                        12.482758,
-                        46.213553
+                        16.5555242,
+                        47.3589738
                     ],
                     [
-                        10.373383,
-                        46.213553
-                    ]
-                ]
-            ],
-            "id": "sdi.provinz.bz.it-WMTS_TOPOMAP_APB-PAB"
-        },
-        {
-            "name": "Stadt Uster Orthophoto 2008 10cm",
-            "type": "tms",
-            "template": "http://mapproxy.sosm.ch:8080/tiles/uster/EPSG900913/{zoom}/{x}/{y}.png?origin=nw",
-            "polygon": [
-                [
-                    [
-                        8.6,
-                        47.31
+                        16.4790525,
+                        46.9768539
                     ],
                     [
-                        8.6,
-                        47.39
+                        16.0355168,
+                        46.8096295
                     ],
                     [
-                        8.77,
-                        47.39
+                        16.0508112,
+                        46.6366332
                     ],
                     [
-                        8.77,
-                        47.31
+                        14.9572663,
+                        46.6313822
                     ],
                     [
-                        8.6,
-                        47.31
-                    ]
-                ]
-            ],
-            "terms_text": "Stadt Uster Vermessung Orthophoto 2008"
-        },
-        {
-            "name": "Stevns (Denmark)",
-            "type": "tms",
-            "template": "http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                0,
-                20
-            ],
-            "polygon": [
-                [
-                    [
-                        12.0913942,
-                        55.3491574
+                        14.574908,
+                        46.3892866
                     ],
                     [
-                        12.0943104,
-                        55.3842256
+                        12.3954655,
+                        46.6891149
                     ],
                     [
-                        12.1573875,
-                        55.3833103
+                        12.1507562,
+                        47.0550608
                     ],
                     [
-                        12.1587287,
-                        55.4013326
+                        11.1183887,
+                        46.9142058
                     ],
                     [
-                        12.1903468,
-                        55.400558
+                        11.0342699,
+                        46.7729797
                     ],
                     [
-                        12.1931411,
-                        55.4364665
+                        10.4836739,
+                        46.8462544
                     ],
                     [
-                        12.2564251,
-                        55.4347995
+                        10.4607324,
+                        46.5472973
                     ],
                     [
-                        12.2547073,
-                        55.4168882
+                        10.1013156,
+                        46.5735879
                     ],
                     [
-                        12.3822489,
-                        55.4134349
+                        10.2007287,
+                        46.1831867
                     ],
                     [
-                        12.3795942,
-                        55.3954143
+                        9.8948421,
+                        46.3629068
                     ],
                     [
-                        12.4109213,
-                        55.3946958
+                        9.5966026,
+                        46.2889758
                     ],
                     [
-                        12.409403,
-                        55.3766417
+                        9.2983631,
+                        46.505206
                     ],
                     [
-                        12.4407807,
-                        55.375779
+                        9.2830687,
+                        46.2572605
                     ],
                     [
-                        12.4394142,
-                        55.3578314
+                        9.0536537,
+                        45.7953255
                     ],
                     [
-                        12.4707413,
-                        55.3569971
+                        8.4265861,
+                        46.2466846
                     ],
                     [
-                        12.4629475,
-                        55.2672214
+                        8.4418804,
+                        46.4736161
                     ],
                     [
-                        12.4315633,
-                        55.2681491
+                        7.8759901,
+                        45.9284607
                     ],
                     [
-                        12.430045,
-                        55.2502103
+                        7.0959791,
+                        45.8645956
                     ],
                     [
-                        12.3672011,
-                        55.2519673
+                        6.7747981,
+                        46.1620044
                     ],
                     [
-                        12.3656858,
-                        55.2340267
+                        6.8206811,
+                        46.4051083
                     ],
                     [
-                        12.2714604,
-                        55.2366031
+                        6.5453831,
+                        46.4578142
                     ],
                     [
-                        12.2744467,
-                        55.272476
+                        6.3312624,
+                        46.3840116
                     ],
                     [
-                        12.2115654,
-                        55.2741475
+                        6.3847926,
+                        46.2466846
                     ],
                     [
-                        12.2130078,
-                        55.2920322
+                        5.8953739,
+                        46.0878021
                     ],
                     [
-                        12.1815665,
-                        55.2928638
+                        6.1171418,
+                        46.3681838
                     ],
                     [
-                        12.183141,
-                        55.3107091
+                        6.0942003,
+                        46.5998657
                     ],
                     [
-                        12.2144897,
-                        55.3100981
+                        6.4383228,
+                        46.7782169
                     ],
                     [
-                        12.2159927,
-                        55.3279764
+                        6.4306756,
+                        46.9298747
                     ],
                     [
-                        12.1214458,
-                        55.3303379
+                        7.0806847,
+                        47.3460216
                     ],
                     [
-                        12.1229489,
-                        55.3483291
-                    ]
-                ]
-            ],
-            "terms_text": "Stevns Kommune"
-        },
-        {
-            "name": "Surrey Air Survey",
-            "type": "tms",
-            "template": "http://gravitystorm.dev.openstreetmap.org/surrey/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                8,
-                19
-            ],
-            "polygon": [
-                [
-                    [
-                        -0.752478,
-                        51.0821941
+                        6.8436226,
+                        47.3719227
                     ],
                     [
-                        -0.7595183,
-                        51.0856254
+                        6.9965659,
+                        47.5012373
                     ],
                     [
-                        -0.8014342,
-                        51.1457917
+                        7.1800979,
+                        47.5064033
                     ],
                     [
-                        -0.8398864,
-                        51.1440686
+                        7.2336281,
+                        47.439206
                     ],
                     [
-                        -0.8357665,
-                        51.1802397
+                        7.4553959,
+                        47.4805683
                     ],
                     [
-                        -0.8529549,
-                        51.2011266
+                        7.7842241,
+                        48.645735
                     ],
                     [
-                        -0.8522683,
-                        51.2096231
+                        8.1971711,
+                        49.0282701
                     ],
                     [
-                        -0.8495217,
-                        51.217903
+                        7.6006921,
+                        49.0382974
                     ],
                     [
-                        -0.8266907,
-                        51.2403696
+                        7.4477487,
+                        49.1634679
                     ],
                     [
-                        -0.8120995,
-                        51.2469248
+                        7.2030394,
+                        49.1034255
                     ],
                     [
-                        -0.7736474,
-                        51.2459577
+                        6.6677378,
+                        49.1634679
                     ],
                     [
-                        -0.7544213,
-                        51.2381127
+                        6.6371491,
+                        49.3331933
                     ],
                     [
-                        -0.754078,
-                        51.233921
+                        6.3542039,
+                        49.4576194
                     ],
                     [
-                        -0.7446366,
-                        51.2333836
+                        6.5453831,
+                        49.8043366
                     ],
                     [
-                        -0.7430693,
-                        51.2847178
+                        6.2471436,
+                        49.873384
                     ],
                     [
-                        -0.751503,
-                        51.3069524
+                        6.0789059,
+                        50.1534883
                     ],
                     [
-                        -0.7664376,
-                        51.3121032
+                        6.3618511,
+                        50.3685934
                     ],
                     [
-                        -0.7820588,
-                        51.3270157
+                        6.0865531,
+                        50.7039632
                     ],
                     [
-                        -0.7815438,
-                        51.3388135
+                        5.8800796,
+                        51.0513752
                     ],
                     [
-                        -0.7374268,
-                        51.3720456
+                        6.1247889,
+                        51.1618085
                     ],
                     [
-                        -0.7192307,
-                        51.3769748
+                        6.1936134,
+                        51.491527
                     ],
                     [
-                        -0.6795769,
-                        51.3847961
+                        5.9641984,
+                        51.7526501
                     ],
                     [
-                        -0.6807786,
-                        51.3901523
+                        6.0253758,
+                        51.8897286
                     ],
                     [
-                        -0.6531411,
-                        51.3917591
+                        6.4536171,
+                        51.8661241
                     ],
                     [
-                        -0.6301385,
-                        51.3905808
+                        6.8436226,
+                        51.9557552
                     ],
                     [
-                        -0.6291085,
-                        51.3970074
+                        6.6906793,
+                        52.0499105
                     ],
                     [
-                        -0.6234437,
-                        51.3977572
+                        7.0042131,
+                        52.2282603
                     ],
                     [
-                        -0.613144,
-                        51.4295552
+                        7.0195074,
+                        52.4525245
                     ],
                     [
-                        -0.6002471,
-                        51.4459121
+                        6.6983264,
+                        52.4665032
                     ],
                     [
-                        -0.5867081,
-                        51.4445365
+                        6.6906793,
+                        52.6524628
                     ],
                     [
-                        -0.5762368,
-                        51.453202
+                        7.0348017,
+                        52.6385432
                     ],
                     [
-                        -0.5626755,
-                        51.4523462
+                        7.0730376,
+                        52.8330151
                     ],
                     [
-                        -0.547741,
-                        51.4469972
+                        7.2183337,
+                        52.9852064
                     ],
                     [
-                        -0.5372697,
-                        51.4448575
+                        7.1953922,
+                        53.3428087
                     ],
                     [
-                        -0.537098,
-                        51.4526671
-                    ],
+                        7.0042131,
+                        53.3291098
+                    ]
+                ]
+            ],
+            "terms_url": "http://openstreetmap.org/",
+            "terms_text": "© OpenStreetMap contributors, CC-BY-SA"
+        },
+        {
+            "name": "OpenStreetMap (Mapnik)",
+            "type": "tms",
+            "description": "The default OpenStreetMap layer.",
+            "template": "http://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                0,
+                19
+            ],
+            "terms_url": "http://openstreetmap.org/",
+            "terms_text": "© OpenStreetMap contributors, CC-BY-SA",
+            "id": "MAPNIK",
+            "default": true
+        },
+        {
+            "name": "OpenStreetMap GPS traces",
+            "type": "tms",
+            "description": "Public GPS traces uploaded to OpenStreetMap.",
+            "template": "http://{switch:a,b,c}.gps-tile.openstreetmap.org/lines/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                0,
+                20
+            ],
+            "terms_url": "http://www.openstreetmap.org/copyright",
+            "terms_text": "© OpenStreetMap contributors",
+            "terms_html": "© <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap contributors</a>. North: <span style='display: inline-block; width: 10px; height: 10px; background-color: #7fed11;'></span> South: <span style='display: inline-block; width: 10px; height: 10px; background-color: #7f11ed;'></span> East: <span style='display: inline-block; width: 10px; height: 10px; background-color: #ff3f3f;'></span> West: <span style='display: inline-block; width: 10px; height: 10px; background-color: #00bfbf;'></span>",
+            "overlay": true
+        },
+        {
+            "name": "Pangasinán/Bulacan (Phillipines HiRes)",
+            "type": "tms",
+            "template": "http://gravitystorm.dev.openstreetmap.org/imagery/philippines/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                12,
+                19
+            ],
+            "polygon": [
+                [
                     [
-                        -0.5439644,
-                        51.4545926
+                        120.336593,
+                        15.985768
                     ],
                     [
-                        -0.5405312,
-                        51.4698865
+                        120.445995,
+                        15.984
                     ],
                     [
-                        -0.5309182,
-                        51.4760881
+                        120.446134,
+                        15.974459
                     ],
                     [
-                        -0.5091172,
-                        51.4744843
+                        120.476464,
+                        15.974592
                     ],
                     [
-                        -0.5086022,
-                        51.4695657
+                        120.594247,
+                        15.946832
                     ],
                     [
-                        -0.4900628,
-                        51.4682825
+                        120.598064,
+                        16.090795
                     ],
                     [
-                        -0.4526406,
-                        51.4606894
+                        120.596537,
+                        16.197999
                     ],
                     [
-                        -0.4486924,
-                        51.4429316
+                        120.368537,
+                        16.218527
                     ],
                     [
-                        -0.4414826,
-                        51.4418616
+                        120.347576,
+                        16.042308
                     ],
                     [
-                        -0.4418259,
-                        51.4369394
-                    ],
+                        120.336593,
+                        15.985768
+                    ]
+                ],
+                [
                     [
-                        -0.4112702,
-                        51.4380095
+                        120.8268,
+                        15.3658
                     ],
                     [
-                        -0.4014855,
-                        51.4279498
+                        121.2684,
+                        15.2602
                     ],
                     [
-                        -0.3807145,
-                        51.4262372
+                        121.2699,
+                        14.7025
                     ],
                     [
-                        -0.3805428,
-                        51.4161749
-                    ],
+                        120.695,
+                        14.8423
+                    ]
+                ]
+            ]
+        },
+        {
+            "name": "Slovakia EEA CORINE 2006",
+            "type": "tms",
+            "template": "http://www.freemap.sk/tms/clc/{zoom}/{x}/{y}.png",
+            "polygon": [
+                [
                     [
-                        -0.3491288,
-                        51.4138195
+                        19.83682,
+                        49.25529
                     ],
                     [
-                        -0.3274994,
-                        51.4037544
+                        19.80075,
+                        49.42385
                     ],
                     [
-                        -0.3039818,
-                        51.3990424
+                        19.60437,
+                        49.48058
                     ],
                     [
-                        -0.3019219,
-                        51.3754747
+                        19.49179,
+                        49.63961
                     ],
                     [
-                        -0.309475,
-                        51.369688
+                        19.21831,
+                        49.52604
                     ],
                     [
-                        -0.3111916,
-                        51.3529669
+                        19.16778,
+                        49.42521
                     ],
                     [
-                        -0.2955704,
-                        51.3541462
+                        19.00308,
+                        49.42236
                     ],
                     [
-                        -0.2923089,
-                        51.3673303
+                        18.97611,
+                        49.5308
                     ],
                     [
-                        -0.2850991,
-                        51.3680805
+                        18.54685,
+                        49.51425
                     ],
                     [
-                        -0.2787476,
-                        51.3771891
+                        18.31432,
+                        49.33818
                     ],
                     [
-                        -0.2655297,
-                        51.3837247
+                        18.15913,
+                        49.2961
                     ],
                     [
-                        -0.2411538,
-                        51.3847961
+                        18.05564,
+                        49.11134
                     ],
                     [
-                        -0.2123147,
-                        51.3628288
+                        17.56396,
+                        48.84938
                     ],
                     [
-                        -0.2107697,
-                        51.3498578
+                        17.17929,
+                        48.88816
                     ],
                     [
-                        -0.190857,
-                        51.3502867
+                        17.058,
+                        48.81105
                     ],
                     [
-                        -0.1542931,
-                        51.3338802
+                        16.90426,
+                        48.61947
                     ],
                     [
-                        -0.1496583,
-                        51.3057719
+                        16.79685,
+                        48.38561
                     ],
                     [
-                        -0.1074296,
-                        51.2966491
+                        17.06762,
+                        48.01116
                     ],
                     [
-                        -0.0887185,
-                        51.3099571
+                        17.32787,
+                        47.97749
                     ],
                     [
-                        -0.0878602,
-                        51.3220811
+                        17.51699,
+                        47.82535
                     ],
                     [
-                        -0.0652009,
-                        51.3215448
+                        17.74776,
+                        47.73093
                     ],
                     [
-                        -0.0641709,
-                        51.3264793
+                        18.29515,
+                        47.72075
                     ],
                     [
-                        -0.0519829,
-                        51.3263721
+                        18.67959,
+                        47.75541
                     ],
                     [
-                        -0.0528412,
-                        51.334631
+                        18.89755,
+                        47.81203
                     ],
                     [
-                        -0.0330779,
-                        51.3430876
+                        18.79463,
+                        47.88245
                     ],
                     [
-                        0.0019187,
-                        51.3376339
+                        18.84318,
+                        48.04046
                     ],
                     [
-                        0.0118751,
-                        51.3281956
+                        19.46212,
+                        48.05333
                     ],
                     [
-                        0.013935,
-                        51.2994398
+                        19.62064,
+                        48.22938
                     ],
                     [
-                        0.0202865,
-                        51.2994398
+                        19.89585,
+                        48.09387
                     ],
                     [
-                        0.0240631,
-                        51.3072743
+                        20.33766,
+                        48.2643
                     ],
                     [
-                        0.0331611,
-                        51.3086694
+                        20.55395,
+                        48.52358
                     ],
                     [
-                        0.0455207,
-                        51.30545
+                        20.82335,
+                        48.55714
                     ],
                     [
-                        0.0523872,
-                        51.2877392
+                        21.10271,
+                        48.47096
                     ],
                     [
-                        0.0616569,
-                        51.2577764
+                        21.45863,
+                        48.55513
                     ],
                     [
-                        0.0640602,
-                        51.2415518
+                        21.74536,
+                        48.31435
                     ],
                     [
-                        0.0462074,
-                        51.2126342
+                        22.15293,
+                        48.37179
                     ],
                     [
-                        0.0407142,
-                        51.2109136
+                        22.61255,
+                        49.08914
                     ],
                     [
-                        0.0448341,
-                        51.1989753
+                        22.09997,
+                        49.23814
                     ],
                     [
-                        0.0494689,
-                        51.1997283
+                        21.9686,
+                        49.36363
                     ],
                     [
-                        0.0558204,
-                        51.1944573
+                        21.6244,
+                        49.46989
                     ],
                     [
-                        0.0611419,
-                        51.1790713
+                        21.06873,
+                        49.46402
                     ],
                     [
-                        0.0623435,
-                        51.1542061
+                        20.94336,
+                        49.31088
                     ],
                     [
-                        0.0577087,
-                        51.1417146
+                        20.73052,
+                        49.44006
                     ],
                     [
-                        0.0204582,
-                        51.1365447
+                        20.22804,
+                        49.41714
                     ],
                     [
-                        -0.0446015,
-                        51.1336364
+                        20.05234,
+                        49.23052
                     ],
                     [
-                        -0.1566964,
-                        51.1352522
-                    ],
+                        19.83682,
+                        49.25529
+                    ]
+                ]
+            ],
+            "terms_url": "http://www.eea.europa.eu/data-and-maps/data/clc-2006-vector-data-version-1",
+            "terms_text": "EEA Corine 2006"
+        },
+        {
+            "name": "Slovakia EEA GMES Urban Atlas",
+            "type": "tms",
+            "template": "http://www.freemap.sk/tms/urbanatlas/{zoom}/{x}/{y}.png",
+            "polygon": [
+                [
                     [
-                        -0.1572114,
-                        51.1290043
+                        19.83682,
+                        49.25529
                     ],
                     [
-                        -0.2287942,
-                        51.1183379
+                        19.80075,
+                        49.42385
                     ],
                     [
-                        -0.2473336,
-                        51.1183379
+                        19.60437,
+                        49.48058
                     ],
                     [
-                        -0.2500802,
-                        51.1211394
+                        19.49179,
+                        49.63961
                     ],
                     [
-                        -0.299347,
-                        51.1137042
+                        19.21831,
+                        49.52604
                     ],
                     [
-                        -0.3221779,
-                        51.1119799
+                        19.16778,
+                        49.42521
                     ],
                     [
-                        -0.3223496,
-                        51.1058367
+                        19.00308,
+                        49.42236
                     ],
                     [
-                        -0.3596001,
-                        51.1019563
+                        18.97611,
+                        49.5308
                     ],
                     [
-                        -0.3589135,
-                        51.1113333
+                        18.54685,
+                        49.51425
                     ],
                     [
-                        -0.3863793,
-                        51.1117644
+                        18.31432,
+                        49.33818
                     ],
                     [
-                        -0.3869014,
-                        51.1062516
+                        18.15913,
+                        49.2961
                     ],
                     [
-                        -0.4281001,
-                        51.0947174
+                        18.05564,
+                        49.11134
                     ],
                     [
-                        -0.4856784,
-                        51.0951554
+                        17.56396,
+                        48.84938
                     ],
                     [
-                        -0.487135,
-                        51.0872266
+                        17.17929,
+                        48.88816
                     ],
                     [
-                        -0.5297404,
-                        51.0865404
+                        17.058,
+                        48.81105
                     ],
                     [
-                        -0.5302259,
-                        51.0789914
+                        16.90426,
+                        48.61947
                     ],
                     [
-                        -0.61046,
-                        51.076551
+                        16.79685,
+                        48.38561
                     ],
                     [
-                        -0.6099745,
-                        51.080669
+                        17.06762,
+                        48.01116
                     ],
                     [
-                        -0.6577994,
-                        51.0792202
+                        17.32787,
+                        47.97749
                     ],
                     [
-                        -0.6582849,
-                        51.0743394
+                        17.51699,
+                        47.82535
                     ],
                     [
-                        -0.6836539,
-                        51.0707547
+                        17.74776,
+                        47.73093
                     ],
                     [
-                        -0.6997979,
-                        51.070831
+                        18.29515,
+                        47.72075
                     ],
                     [
-                        -0.7296581,
-                        51.0744919
-                    ]
-                ]
-            ]
-        },
-        {
-            "name": "Toulouse - Orthophotoplan 2007",
-            "type": "tms",
-            "template": "http://wms.openstreetmap.fr/tms/1.0.0/toulouse_ortho2007/{zoom}/{x}/{y}",
-            "scaleExtent": [
-                0,
-                22
-            ],
-            "polygon": [
-                [
-                    [
-                        1.1919978,
-                        43.6328791
+                        18.67959,
+                        47.75541
                     ],
                     [
-                        1.2015377,
-                        43.6329729
+                        18.89755,
+                        47.81203
                     ],
                     [
-                        1.2011107,
-                        43.6554932
+                        18.79463,
+                        47.88245
                     ],
                     [
-                        1.2227985,
-                        43.6557029
+                        18.84318,
+                        48.04046
                     ],
                     [
-                        1.2226231,
-                        43.6653353
+                        19.46212,
+                        48.05333
                     ],
                     [
-                        1.2275341,
-                        43.6653849
+                        19.62064,
+                        48.22938
                     ],
                     [
-                        1.2275417,
-                        43.6656387
+                        19.89585,
+                        48.09387
                     ],
                     [
-                        1.2337568,
-                        43.6656883
+                        20.33766,
+                        48.2643
                     ],
                     [
-                        1.2337644,
-                        43.6650153
+                        20.55395,
+                        48.52358
                     ],
                     [
-                        1.2351218,
-                        43.6650319
+                        20.82335,
+                        48.55714
                     ],
                     [
-                        1.2350913,
-                        43.6670729
+                        21.10271,
+                        48.47096
                     ],
                     [
-                        1.2443566,
-                        43.6671556
+                        21.45863,
+                        48.55513
                     ],
                     [
-                        1.2441584,
-                        43.6743925
+                        21.74536,
+                        48.31435
                     ],
                     [
-                        1.2493973,
-                        43.6744256
+                        22.15293,
+                        48.37179
                     ],
                     [
-                        1.2493973,
-                        43.6746628
+                        22.61255,
+                        49.08914
                     ],
                     [
-                        1.2555666,
-                        43.6747234
+                        22.09997,
+                        49.23814
                     ],
                     [
-                        1.2555742,
-                        43.6744532
+                        21.9686,
+                        49.36363
                     ],
                     [
-                        1.2569545,
-                        43.6744697
+                        21.6244,
+                        49.46989
                     ],
                     [
-                        1.2568782,
-                        43.678529
+                        21.06873,
+                        49.46402
                     ],
                     [
-                        1.2874873,
-                        43.6788257
+                        20.94336,
+                        49.31088
                     ],
                     [
-                        1.2870803,
-                        43.7013229
+                        20.73052,
+                        49.44006
                     ],
                     [
-                        1.3088219,
-                        43.7014632
+                        20.22804,
+                        49.41714
                     ],
                     [
-                        1.3086493,
-                        43.7127673
+                        20.05234,
+                        49.23052
                     ],
                     [
-                        1.3303262,
-                        43.7129544
-                    ],
+                        19.83682,
+                        49.25529
+                    ]
+                ]
+            ],
+            "terms_url": "http://www.eea.europa.eu/data-and-maps/data/urban-atlas",
+            "terms_text": "EEA GMES Urban Atlas"
+        },
+        {
+            "name": "Slovakia Historic Maps",
+            "type": "tms",
+            "template": "http://tms.freemap.sk/historicke/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                0,
+                12
+            ],
+            "polygon": [
+                [
                     [
-                        1.3300242,
-                        43.7305221
+                        16.8196949,
+                        47.4927236
                     ],
                     [
-                        1.3367106,
-                        43.7305845
+                        16.8196949,
+                        49.5030322
                     ],
                     [
-                        1.3367322,
-                        43.7312235
+                        22.8388318,
+                        49.5030322
                     ],
                     [
-                        1.3734338,
-                        43.7310456
+                        22.8388318,
+                        47.4927236
                     ],
                     [
-                        1.3735848,
-                        43.7245772
-                    ],
+                        16.8196949,
+                        47.4927236
+                    ]
+                ]
+            ]
+        },
+        {
+            "name": "South Africa CD:NGI Aerial",
+            "type": "tms",
+            "template": "http://{switch:a,b,c}.aerial.openstreetmap.org.za/ngi-aerial/{zoom}/{x}/{y}.jpg",
+            "scaleExtent": [
+                1,
+                22
+            ],
+            "polygon": [
+                [
                     [
-                        1.4604504,
-                        43.7252947
+                        17.8396817,
+                        -32.7983384
                     ],
                     [
-                        1.4607783,
-                        43.7028034
+                        17.8893509,
+                        -32.6972835
                     ],
                     [
-                        1.4824875,
-                        43.7029516
+                        18.00364,
+                        -32.6982187
                     ],
                     [
-                        1.4829828,
-                        43.6692071
+                        18.0991679,
+                        -32.7485251
                     ],
                     [
-                        1.5046832,
-                        43.6693616
+                        18.2898747,
+                        -32.5526645
                     ],
                     [
-                        1.5048383,
-                        43.6581174
+                        18.2930182,
+                        -32.0487089
                     ],
                     [
-                        1.5265475,
-                        43.6582656
+                        18.105455,
+                        -31.6454966
                     ],
                     [
-                        1.5266945,
-                        43.6470298
+                        17.8529257,
+                        -31.3443951
                     ],
                     [
-                        1.548368,
-                        43.6471633
+                        17.5480046,
+                        -30.902171
                     ],
                     [
-                        1.5485357,
-                        43.6359385
+                        17.4044506,
+                        -30.6374731
                     ],
                     [
-                        1.5702172,
-                        43.636082
+                        17.2493704,
+                        -30.3991663
                     ],
                     [
-                        1.5705123,
-                        43.6135777
+                        16.9936977,
+                        -29.6543552
                     ],
                     [
-                        1.5488166,
-                        43.6134276
+                        16.7987996,
+                        -29.19437
                     ],
                     [
-                        1.549097,
-                        43.5909479
+                        16.5494139,
+                        -28.8415949
                     ],
                     [
-                        1.5707695,
-                        43.5910694
+                        16.4498691,
+                        -28.691876
                     ],
                     [
-                        1.5709373,
-                        43.5798341
+                        16.4491046,
+                        -28.5515766
                     ],
                     [
-                        1.5793714,
-                        43.5798894
+                        16.6002551,
+                        -28.4825663
                     ],
                     [
-                        1.5794782,
-                        43.5737682
+                        16.7514057,
+                        -28.4486958
                     ],
                     [
-                        1.5809119,
-                        43.5737792
+                        16.7462192,
+                        -28.2458973
                     ],
                     [
-                        1.5810859,
-                        43.5573794
+                        16.8855148,
+                        -28.04729
                     ],
                     [
-                        1.5712334,
-                        43.5573131
+                        16.9929502,
+                        -28.0244005
                     ],
                     [
-                        1.5716504,
-                        43.5235497
+                        17.0529659,
+                        -28.0257086
                     ],
                     [
-                        1.3984804,
-                        43.5222618
+                        17.1007562,
+                        -28.0338839
                     ],
                     [
-                        1.3986509,
-                        43.5110113
+                        17.2011527,
+                        -28.0930546
                     ],
                     [
-                        1.3120959,
-                        43.5102543
+                        17.2026346,
+                        -28.2328424
                     ],
                     [
-                        1.3118968,
-                        43.5215192
+                        17.2474611,
+                        -28.2338215
                     ],
                     [
-                        1.2902569,
-                        43.5213126
+                        17.2507953,
+                        -28.198892
                     ],
                     [
-                        1.2898637,
-                        43.5438168
+                        17.3511919,
+                        -28.1975861
                     ],
                     [
-                        1.311517,
-                        43.5440133
+                        17.3515624,
+                        -28.2442655
                     ],
                     [
-                        1.3113271,
-                        43.5552596
+                        17.4015754,
+                        -28.2452446
                     ],
                     [
-                        1.3036924,
-                        43.5551924
+                        17.4149122,
+                        -28.3489751
                     ],
                     [
-                        1.3036117,
-                        43.5595099
+                        17.4008345,
+                        -28.547997
                     ],
                     [
-                        1.2955449,
-                        43.5594317
+                        17.4526999,
+                        -28.5489733
                     ],
                     [
-                        1.2955449,
-                        43.5595489
+                        17.4512071,
+                        -28.6495106
                     ],
                     [
-                        1.2895595,
-                        43.5594473
+                        17.4983599,
+                        -28.6872054
                     ],
                     [
-                        1.2892899,
-                        43.5775366
+                        17.6028204,
+                        -28.6830048
                     ],
                     [
-                        1.2675698,
-                        43.5773647
+                        17.6499732,
+                        -28.6967928
                     ],
                     [
-                        1.2673973,
-                        43.5886141
+                        17.6525928,
+                        -28.7381457
                     ],
                     [
-                        1.25355,
-                        43.5885047
+                        17.801386,
+                        -28.7381457
                     ],
                     [
-                        1.2533774,
-                        43.5956282
+                        17.9994276,
+                        -28.7560602
                     ],
                     [
-                        1.2518029,
-                        43.5956282
+                        18.0002748,
+                        -28.7956172
                     ],
                     [
-                        1.2518029,
-                        43.5949409
+                        18.1574507,
+                        -28.8718055
                     ],
                     [
-                        1.2350437,
-                        43.5947847
+                        18.5063811,
+                        -28.8718055
                     ],
                     [
-                        1.2350437,
-                        43.5945972
+                        18.6153564,
+                        -28.8295875
                     ],
                     [
-                        1.2239572,
-                        43.5945972
+                        18.9087513,
+                        -28.8277516
                     ],
                     [
-                        1.2239357,
-                        43.5994708
+                        19.1046973,
+                        -28.9488548
                     ],
                     [
-                        1.2139708,
-                        43.599299
+                        19.1969071,
+                        -28.9378513
                     ],
                     [
-                        1.2138845,
-                        43.6046408
+                        19.243012,
+                        -28.8516164
                     ],
                     [
-                        1.2020647,
-                        43.6044846
+                        19.2314858,
+                        -28.802963
                     ],
                     [
-                        1.2019464,
-                        43.61048
+                        19.2587296,
+                        -28.7009928
                     ],
                     [
-                        1.1924294,
-                        43.6103695
-                    ]
-                ]
-            ],
-            "terms_url": "https://wiki.openstreetmap.org/wiki/Toulouse/ToulouseMetropoleData",
-            "terms_text": "ToulouseMetropole"
-        },
-        {
-            "name": "Toulouse - Orthophotoplan 2011",
-            "type": "tms",
-            "template": "http://wms.openstreetmap.fr/tms/1.0.0/toulouse_ortho2011/{zoom}/{x}/{y}",
-            "scaleExtent": [
-                0,
-                22
-            ],
-            "polygon": [
-                [
-                    [
-                        1.1135067,
-                        43.6867566
+                        19.4431493,
+                        -28.6973163
                     ],
                     [
-                        1.1351836,
-                        43.6870842
+                        19.5500289,
+                        -28.4958332
                     ],
                     [
-                        1.1348907,
-                        43.6983471
+                        19.6967264,
+                        -28.4939914
                     ],
                     [
-                        1.1782867,
-                        43.6990338
+                        19.698822,
+                        -28.4479358
                     ],
                     [
-                        1.1779903,
-                        43.7102786
+                        19.8507587,
+                        -28.4433291
                     ],
                     [
-                        1.1996591,
-                        43.7106144
+                        19.8497109,
+                        -28.4027818
                     ],
                     [
-                        1.1993387,
-                        43.7218722
+                        19.9953605,
+                        -28.399095
                     ],
                     [
-                        1.2427356,
-                        43.7225269
+                        19.9893671,
+                        -24.7497859
                     ],
                     [
-                        1.2424336,
-                        43.7337491
+                        20.2916682,
+                        -24.9192346
                     ],
                     [
-                        1.2641536,
-                        43.734092
+                        20.4724562,
+                        -25.1501701
                     ],
                     [
-                        1.2638301,
-                        43.7453588
+                        20.6532441,
+                        -25.4529449
                     ],
                     [
-                        1.2855285,
-                        43.7456548
+                        20.733265,
+                        -25.6801957
                     ],
                     [
-                        1.2852481,
-                        43.756935
+                        20.8281046,
+                        -25.8963498
                     ],
                     [
-                        1.306925,
-                        43.757231
+                        20.8429232,
+                        -26.215851
                     ],
                     [
-                        1.3066446,
-                        43.7684779
+                        20.6502804,
+                        -26.4840868
                     ],
                     [
-                        1.3283431,
-                        43.7687894
+                        20.6532441,
+                        -26.8204869
                     ],
                     [
-                        1.3280842,
-                        43.780034
+                        21.0889134,
+                        -26.846933
                     ],
                     [
-                        1.4367275,
-                        43.7815757
+                        21.6727695,
+                        -26.8389998
                     ],
                     [
-                        1.4373098,
-                        43.7591004
+                        21.7765003,
+                        -26.6696268
                     ],
                     [
-                        1.4590083,
-                        43.7593653
+                        21.9721069,
+                        -26.6431395
                     ],
                     [
-                        1.4593318,
-                        43.7481479
+                        22.2803355,
+                        -26.3274702
                     ],
                     [
-                        1.4810303,
-                        43.7483972
+                        22.5707817,
+                        -26.1333967
                     ],
                     [
-                        1.4813322,
-                        43.7371777
+                        22.7752795,
+                        -25.6775246
                     ],
                     [
-                        1.5030307,
-                        43.7374115
+                        23.0005235,
+                        -25.2761948
                     ],
                     [
-                        1.5035915,
-                        43.7149664
+                        23.4658301,
+                        -25.2735148
                     ],
                     [
-                        1.5253115,
-                        43.7151846
+                        23.883717,
+                        -25.597366
                     ],
                     [
-                        1.5256135,
-                        43.7040057
+                        24.2364017,
+                        -25.613402
                     ],
                     [
-                        1.5472688,
-                        43.7042552
+                        24.603905,
+                        -25.7896563
                     ],
                     [
-                        1.5475708,
-                        43.6930431
+                        25.110704,
+                        -25.7389432
                     ],
                     [
-                        1.5692045,
-                        43.6932926
+                        25.5078447,
+                        -25.6855376
                     ],
                     [
-                        1.5695712,
-                        43.6820316
+                        25.6441766,
+                        -25.4823781
                     ],
                     [
-                        1.5912049,
-                        43.6822656
+                        25.8419267,
+                        -24.7805437
                     ],
                     [
-                        1.5917441,
-                        43.6597998
+                        25.846641,
+                        -24.7538456
                     ],
                     [
-                        1.613421,
-                        43.6600339
+                        26.3928487,
+                        -24.6332894
                     ],
                     [
-                        1.613723,
-                        43.6488291
+                        26.4739066,
+                        -24.5653312
                     ],
                     [
-                        1.6353783,
-                        43.6490788
+                        26.5089966,
+                        -24.4842437
                     ],
                     [
-                        1.6384146,
-                        43.5140731
+                        26.5861946,
+                        -24.4075775
                     ],
                     [
-                        1.2921649,
-                        43.5094658
+                        26.7300635,
+                        -24.3014458
                     ],
                     [
-                        1.2918629,
-                        43.5206966
+                        26.8567384,
+                        -24.2499463
                     ],
                     [
-                        1.2702076,
-                        43.5203994
+                        26.8574402,
+                        -24.1026901
                     ],
                     [
-                        1.2698841,
-                        43.5316437
+                        26.9215471,
+                        -23.8990957
                     ],
                     [
-                        1.2482288,
-                        43.531331
+                        26.931831,
+                        -23.8461891
                     ],
                     [
-                        1.2476048,
-                        43.5537788
+                        26.9714827,
+                        -23.6994344
                     ],
                     [
-                        1.2259628,
-                        43.5534914
+                        27.0006074,
+                        -23.6367644
                     ],
                     [
-                        1.2256819,
-                        43.564716
+                        27.0578041,
+                        -23.6052574
                     ],
                     [
-                        1.2039835,
-                        43.564419
+                        27.1360547,
+                        -23.5203437
                     ],
                     [
-                        1.2033148,
-                        43.5869049
+                        27.3339623,
+                        -23.3973792
                     ],
                     [
-                        1.1816164,
-                        43.5865611
+                        27.5144057,
+                        -23.3593929
                     ],
                     [
-                        1.1810237,
-                        43.6090368
+                        27.5958145,
+                        -23.2085465
                     ],
                     [
-                        1.1592821,
-                        43.6086932
+                        27.8098634,
+                        -23.0994957
                     ],
                     [
-                        1.1589585,
-                        43.6199523
+                        27.8828506,
+                        -23.0620496
                     ],
                     [
-                        1.1372601,
-                        43.6196244
+                        27.9382928,
+                        -22.9496487
                     ],
                     [
-                        1.1365933,
-                        43.642094
+                        28.0407556,
+                        -22.8255118
                     ],
                     [
-                        1.1149055,
-                        43.6417629
-                    ]
-                ]
-            ],
-            "terms_url": "https://wiki.openstreetmap.org/wiki/Toulouse/ToulouseMetropoleData",
-            "terms_text": "ToulouseMetropole"
-        },
-        {
-            "name": "Tours - Orthophotos 2008",
-            "type": "tms",
-            "template": "http://tms.mapspot.ge/tms/2/nonstandard/{zoom}/{x}/{y}.jpeg",
-            "polygon": [
-                [
-                    [
-                        0.5457462,
-                        47.465264
+                        28.2056786,
+                        -22.6552861
                     ],
                     [
-                        0.54585,
-                        47.4608163
+                        28.3397223,
+                        -22.5639374
                     ],
                     [
-                        0.5392188,
-                        47.4606983
+                        28.4906093,
+                        -22.560697
                     ],
                     [
-                        0.5393484,
-                        47.456243
+                        28.6108769,
+                        -22.5400248
                     ],
                     [
-                        0.5327959,
-                        47.4561003
+                        28.828175,
+                        -22.4550173
                     ],
                     [
-                        0.5329011,
-                        47.451565
+                        28.9285324,
+                        -22.4232328
                     ],
                     [
-                        0.52619,
-                        47.4514013
+                        28.9594116,
+                        -22.3090081
                     ],
                     [
-                        0.5265854,
-                        47.4424884
+                        29.0162574,
+                        -22.208335
                     ],
                     [
-                        0.5000941,
-                        47.4420739
+                        29.2324117,
+                        -22.1693453
                     ],
                     [
-                        0.5002357,
-                        47.4375835
+                        29.3531213,
+                        -22.1842926
                     ],
                     [
-                        0.4936014,
-                        47.4374324
+                        29.6548952,
+                        -22.1186426
                     ],
                     [
-                        0.4937,
-                        47.4329285
+                        29.7777102,
+                        -22.1361956
                     ],
                     [
-                        0.4606141,
-                        47.4324593
+                        29.9292989,
+                        -22.1849425
                     ],
                     [
-                        0.4607248,
-                        47.4279827
+                        30.1166795,
+                        -22.2830348
                     ],
                     [
-                        0.4541016,
-                        47.4278125
+                        30.2563377,
+                        -22.2914767
                     ],
                     [
-                        0.454932,
-                        47.4053921
+                        30.3033582,
+                        -22.3395204
                     ],
                     [
-                        0.4615431,
-                        47.4054476
+                        30.5061784,
+                        -22.3057617
                     ],
                     [
-                        0.4619097,
-                        47.3964924
+                        30.8374279,
+                        -22.284983
                     ],
                     [
-                        0.4684346,
-                        47.3966005
+                        31.0058599,
+                        -22.3077095
                     ],
                     [
-                        0.4691319,
-                        47.3786415
+                        31.1834152,
+                        -22.3232913
                     ],
                     [
-                        0.4757125,
-                        47.3787609
+                        31.2930586,
+                        -22.3674647
                     ],
                     [
-                        0.4762116,
-                        47.3652018
+                        31.5680579,
+                        -23.1903385
                     ],
                     [
-                        0.4828297,
-                        47.3653499
+                        31.5568311,
+                        -23.4430809
                     ],
                     [
-                        0.4832223,
-                        47.3518574
+                        31.6931122,
+                        -23.6175209
                     ],
                     [
-                        0.5097927,
-                        47.3522592
+                        31.7119696,
+                        -23.741136
                     ],
                     [
-                        0.5095688,
-                        47.3567713
+                        31.7774743,
+                        -23.8800628
                     ],
                     [
-                        0.5227698,
-                        47.3569785
+                        31.8886337,
+                        -23.9481098
                     ],
                     [
-                        0.5226429,
-                        47.3614867
+                        31.9144386,
+                        -24.1746736
                     ],
                     [
-                        0.5490721,
-                        47.3618878
+                        31.9948307,
+                        -24.3040878
                     ],
                     [
-                        0.5489087,
-                        47.3663307
+                        32.0166656,
+                        -24.4405988
                     ],
                     [
-                        0.5555159,
-                        47.3664985
+                        32.0077331,
+                        -24.6536578
                     ],
                     [
-                        0.5559105,
-                        47.3575522
+                        32.019643,
+                        -24.9140701
                     ],
                     [
-                        0.6152789,
-                        47.358407
+                        32.035523,
+                        -25.0849767
                     ],
                     [
-                        0.6152963,
-                        47.362893
+                        32.019643,
+                        -25.3821442
                     ],
                     [
-                        0.6285093,
-                        47.3630936
+                        31.9928457,
+                        -25.4493771
                     ],
                     [
-                        0.6288256,
-                        47.353987
+                        31.9997931,
+                        -25.5165725
                     ],
                     [
-                        0.6155012,
-                        47.3538823
+                        32.0057481,
+                        -25.6078978
                     ],
                     [
-                        0.6157682,
-                        47.3493424
+                        32.0057481,
+                        -25.6624806
                     ],
                     [
-                        0.6090956,
-                        47.3492991
+                        31.9362735,
+                        -25.8403721
                     ],
                     [
-                        0.6094735,
-                        47.3402962
+                        31.9809357,
+                        -25.9546537
                     ],
                     [
-                        0.6160477,
-                        47.3404448
+                        31.8687838,
+                        -26.0037251
                     ],
                     [
-                        0.616083,
-                        47.3369074
+                        31.4162062,
+                        -25.7277683
                     ],
                     [
-                        0.77497,
-                        47.3388218
+                        31.3229117,
+                        -25.7438611
                     ],
                     [
-                        0.7745786,
-                        47.351628
+                        31.2504595,
+                        -25.8296526
                     ],
                     [
-                        0.7680363,
-                        47.3515901
+                        31.1393001,
+                        -25.9162746
                     ],
                     [
-                        0.767589,
-                        47.3605298
+                        31.1164727,
+                        -25.9912361
                     ],
                     [
-                        0.7742443,
-                        47.3606238
+                        30.9656135,
+                        -26.2665756
                     ],
                     [
-                        0.7733465,
-                        47.3921266
+                        30.8921689,
+                        -26.3279703
                     ],
                     [
-                        0.7667434,
-                        47.3920195
+                        30.8534616,
+                        -26.4035568
                     ],
                     [
-                        0.7664411,
-                        47.4010837
+                        30.8226943,
+                        -26.4488849
                     ],
                     [
-                        0.7730647,
-                        47.4011115
+                        30.8022583,
+                        -26.5240694
                     ],
                     [
-                        0.7728868,
-                        47.4101297
+                        30.8038369,
+                        -26.8082089
                     ],
                     [
-                        0.7661849,
-                        47.4100226
+                        30.9020939,
+                        -26.7807451
                     ],
                     [
-                        0.7660267,
-                        47.4145044
+                        30.9100338,
+                        -26.8489495
                     ],
                     [
-                        0.7527613,
-                        47.4143038
+                        30.9824859,
+                        -26.9082627
                     ],
                     [
-                        0.7529788,
-                        47.4098086
+                        30.976531,
+                        -27.0029222
                     ],
                     [
-                        0.7462373,
-                        47.4097016
+                        31.0034434,
+                        -27.0441587
                     ],
                     [
-                        0.7459424,
-                        47.4232208
+                        31.1543322,
+                        -27.1980416
                     ],
                     [
-                        0.7392324,
-                        47.4231451
+                        31.5015607,
+                        -27.311117
                     ],
                     [
-                        0.738869,
-                        47.4366116
+                        31.9700183,
+                        -27.311117
                     ],
                     [
-                        0.7323267,
-                        47.4365171
+                        31.9700183,
+                        -27.120472
                     ],
                     [
-                        0.7321869,
-                        47.4410556
+                        31.9769658,
+                        -27.050664
                     ],
                     [
-                        0.7255048,
-                        47.44098
+                        32.0002464,
+                        -26.7983892
                     ],
                     [
-                        0.7254209,
-                        47.4453479
+                        32.1069826,
+                        -26.7984645
                     ],
                     [
-                        0.7318793,
-                        47.4454803
+                        32.3114546,
+                        -26.8479493
                     ],
                     [
-                        0.7318514,
-                        47.4501126
+                        32.899986,
+                        -26.8516059
                     ],
                     [
-                        0.7384496,
-                        47.450226
+                        32.886091,
+                        -26.9816971
                     ],
                     [
-                        0.7383098,
-                        47.454631
+                        32.709427,
+                        -27.4785436
                     ],
                     [
-                        0.7449359,
-                        47.4547444
+                        32.6240724,
+                        -27.7775144
                     ],
                     [
-                        0.7443209,
-                        47.4771985
+                        32.5813951,
+                        -28.07479
                     ],
                     [
-                        0.7310685,
-                        47.4769717
+                        32.5387178,
+                        -28.2288046
                     ],
                     [
-                        0.7309008,
-                        47.4815445
+                        32.4275584,
+                        -28.5021568
                     ],
                     [
-                        0.7176205,
-                        47.4812611
+                        32.3640388,
+                        -28.5945699
                     ],
                     [
-                        0.7177883,
-                        47.4768394
+                        32.0702603,
+                        -28.8469827
                     ],
                     [
-                        0.69777,
-                        47.4764993
+                        31.9878832,
+                        -28.9069497
                     ],
                     [
-                        0.6980496,
-                        47.4719827
+                        31.7764818,
+                        -28.969487
                     ],
                     [
-                        0.6914514,
-                        47.4718882
+                        31.4638459,
+                        -29.2859343
                     ],
                     [
-                        0.6917309,
-                        47.4630241
+                        31.359634,
+                        -29.3854348
                     ],
                     [
-                        0.6851048,
-                        47.4629295
+                        31.1680825,
+                        -29.6307408
                     ],
                     [
-                        0.684937,
-                        47.4673524
+                        31.064863,
+                        -29.7893535
                     ],
                     [
-                        0.678255,
-                        47.4673335
+                        31.0534493,
+                        -29.8470469
                     ],
                     [
-                        0.6779754,
-                        47.4762158
+                        31.0669933,
+                        -29.8640319
                     ],
                     [
-                        0.6714051,
-                        47.4761592
+                        31.0455459,
+                        -29.9502017
                     ],
                     [
-                        0.6710417,
-                        47.4881952
+                        30.9518556,
+                        -30.0033946
                     ],
                     [
-                        0.6577334,
-                        47.4879685
+                        30.8651833,
+                        -30.1024093
                     ],
                     [
-                        0.6578173,
-                        47.48504
+                        30.7244725,
+                        -30.392502
                     ],
                     [
-                        0.6511911,
-                        47.4848322
+                        30.3556256,
+                        -30.9308873
                     ],
                     [
-                        0.6514707,
-                        47.4758568
+                        30.0972364,
+                        -31.2458274
                     ],
                     [
-                        0.6448166,
-                        47.4757245
+                        29.8673136,
+                        -31.4304296
                     ],
                     [
-                        0.6449284,
-                        47.4712646
+                        29.7409393,
+                        -31.5014699
                     ],
                     [
-                        0.6117976,
-                        47.4707543
+                        29.481312,
+                        -31.6978686
                     ],
                     [
-                        0.6118815,
-                        47.4663129
+                        28.8943171,
+                        -32.2898903
                     ],
                     [
-                        0.6052833,
-                        47.4661239
+                        28.5497137,
+                        -32.5894641
                     ],
                     [
-                        0.6054231,
-                        47.4616631
+                        28.1436499,
+                        -32.8320732
                     ],
                     [
-                        0.5988808,
-                        47.4615497
+                        28.0748735,
+                        -32.941689
                     ],
                     [
-                        0.5990206,
-                        47.4570886
+                        27.8450942,
+                        -33.082869
                     ],
                     [
-                        0.572488,
-                        47.4566916
+                        27.3757956,
+                        -33.3860685
                     ],
                     [
-                        0.5721805,
-                        47.4656513
-                    ]
-                ]
-            ],
-            "terms_url": "http://wiki.openstreetmap.org/wiki/Tours/Orthophoto",
-            "terms_text": "Orthophoto Tour(s) Plus 2008"
-        },
-        {
-            "name": "Tours - Orthophotos 2008-2010",
-            "type": "tms",
-            "template": "http://wms.openstreetmap.fr/tms/1.0.0/tours/{zoom}/{x}/{y}",
-            "scaleExtent": [
-                0,
-                20
-            ],
-            "polygon": [
-                [
-                    [
-                        0.5457462,
-                        47.465264
+                        26.8805407,
+                        -33.6458951
                     ],
                     [
-                        0.54585,
-                        47.4608163
+                        26.5916871,
+                        -33.7480756
                     ],
                     [
-                        0.5392188,
-                        47.4606983
+                        26.4527308,
+                        -33.7935795
                     ],
                     [
-                        0.5393484,
-                        47.456243
+                        26.206754,
+                        -33.7548943
                     ],
                     [
-                        0.5327959,
-                        47.4561003
+                        26.0077897,
+                        -33.7223961
                     ],
                     [
-                        0.5329011,
-                        47.451565
+                        25.8055494,
+                        -33.7524272
                     ],
                     [
-                        0.52619,
-                        47.4514013
+                        25.7511073,
+                        -33.8006512
                     ],
                     [
-                        0.5265854,
-                        47.4424884
+                        25.6529079,
+                        -33.8543597
                     ],
                     [
-                        0.5000941,
-                        47.4420739
+                        25.6529079,
+                        -33.9469768
                     ],
                     [
-                        0.5002357,
-                        47.4375835
+                        25.7195789,
+                        -34.0040115
                     ],
                     [
-                        0.4936014,
-                        47.4374324
+                        25.7202807,
+                        -34.0511235
                     ],
                     [
-                        0.4937,
-                        47.4329285
+                        25.5508915,
+                        -34.063151
                     ],
                     [
-                        0.4606141,
-                        47.4324593
+                        25.3504571,
+                        -34.0502627
                     ],
                     [
-                        0.4607248,
-                        47.4279827
+                        25.2810609,
+                        -34.0020322
                     ],
                     [
-                        0.4541016,
-                        47.4278125
+                        25.0476316,
+                        -33.9994588
                     ],
                     [
-                        0.454932,
-                        47.4053921
+                        24.954724,
+                        -34.0043594
                     ],
                     [
-                        0.4615431,
-                        47.4054476
+                        24.9496586,
+                        -34.1010363
                     ],
                     [
-                        0.4619097,
-                        47.3964924
+                        24.8770358,
+                        -34.1506456
                     ],
                     [
-                        0.4684346,
-                        47.3966005
+                        24.8762914,
+                        -34.2005281
                     ],
                     [
-                        0.4691319,
-                        47.3786415
+                        24.8532574,
+                        -34.2189562
                     ],
                     [
-                        0.4757125,
-                        47.3787609
+                        24.7645287,
+                        -34.2017946
                     ],
                     [
-                        0.4762116,
-                        47.3652018
+                        24.5001356,
+                        -34.2003254
                     ],
                     [
-                        0.4828297,
-                        47.3653499
+                        24.3486733,
+                        -34.1163824
                     ],
                     [
-                        0.4829611,
-                        47.3608321
+                        24.1988819,
+                        -34.1019039
                     ],
                     [
-                        0.4763543,
-                        47.360743
+                        23.9963377,
+                        -34.0514443
                     ],
                     [
-                        0.476654,
-                        47.3517263
+                        23.8017509,
+                        -34.0524332
                     ],
                     [
-                        0.4700497,
-                        47.3516186
+                        23.7493589,
+                        -34.0111855
                     ],
                     [
-                        0.4701971,
-                        47.3471313
+                        23.4973536,
+                        -34.009014
                     ],
                     [
-                        0.4637503,
-                        47.3470104
+                        23.4155191,
+                        -34.0434586
                     ],
                     [
-                        0.4571425,
-                        47.3424146
+                        23.4154284,
+                        -34.1140433
                     ],
                     [
-                        0.4572922,
-                        47.3379061
+                        22.9000853,
+                        -34.0993009
                     ],
                     [
-                        0.4506741,
-                        47.3378081
+                        22.8412418,
+                        -34.0547911
                     ],
                     [
-                        0.4508379,
-                        47.3333051
+                        22.6470321,
+                        -34.0502627
                     ],
                     [
-                        0.4442212,
-                        47.3332032
+                        22.6459843,
+                        -34.0072768
                     ],
                     [
-                        0.4443809,
-                        47.328711
+                        22.570016,
+                        -34.0064081
                     ],
                     [
-                        0.4311392,
-                        47.3284977
+                        22.5050499,
+                        -34.0645866
                     ],
                     [
-                        0.4316262,
-                        47.3150004
+                        22.2519968,
+                        -34.0645866
                     ],
                     [
-                        0.4382432,
-                        47.3151136
+                        22.2221334,
+                        -34.1014701
                     ],
                     [
-                        0.4383815,
-                        47.3106174
+                        22.1621197,
+                        -34.1057019
                     ],
                     [
-                        0.4714487,
-                        47.3111374
+                        22.1712431,
+                        -34.1521766
                     ],
                     [
-                        0.4713096,
-                        47.3156565
+                        22.1576913,
+                        -34.2180897
                     ],
                     [
-                        0.477888,
-                        47.3157542
+                        22.0015632,
+                        -34.2172232
                     ],
                     [
-                        0.4780733,
-                        47.3112802
+                        21.9496952,
+                        -34.3220009
                     ],
                     [
-                        0.4846826,
-                        47.3113639
+                        21.8611528,
+                        -34.4007145
                     ],
                     [
-                        0.4848576,
-                        47.3068686
+                        21.5614708,
+                        -34.4020114
                     ],
                     [
-                        0.4914359,
-                        47.3069803
+                        21.5468011,
+                        -34.3661242
                     ],
                     [
-                        0.491745,
-                        47.2979733
+                        21.501744,
+                        -34.3669892
                     ],
                     [
-                        0.4851578,
-                        47.2978722
+                        21.5006961,
+                        -34.4020114
                     ],
                     [
-                        0.4854269,
-                        47.2888744
+                        21.4194886,
+                        -34.4465247
                     ],
                     [
-                        0.4788485,
-                        47.2887697
+                        21.1978706,
+                        -34.4478208
                     ],
                     [
-                        0.4791574,
-                        47.2797818
+                        21.0988193,
+                        -34.3991325
                     ],
                     [
-                        0.4857769,
-                        47.2799005
+                        21.0033746,
+                        -34.3753872
                     ],
                     [
-                        0.4859107,
-                        47.2753885
+                        20.893192,
+                        -34.3997115
                     ],
                     [
-                        0.492539,
-                        47.2755029
+                        20.8976647,
+                        -34.4854003
                     ],
                     [
-                        0.4926669,
-                        47.2710127
+                        20.7446802,
+                        -34.4828092
                     ],
                     [
-                        0.4992986,
-                        47.2711066
+                        20.5042011,
+                        -34.486264
                     ],
                     [
-                        0.4994296,
-                        47.2666116
+                        20.2527197,
+                        -34.701477
                     ],
                     [
-                        0.5192658,
-                        47.2669245
+                        20.0803502,
+                        -34.8361855
                     ],
                     [
-                        0.5194225,
-                        47.2624231
+                        19.9923317,
+                        -34.8379056
                     ],
                     [
-                        0.5260186,
-                        47.2625205
+                        19.899074,
+                        -34.8275845
                     ],
                     [
-                        0.5258735,
-                        47.2670183
+                        19.8938348,
+                        -34.7936018
                     ],
                     [
-                        0.5456972,
-                        47.2673383
+                        19.5972963,
+                        -34.7961833
                     ],
                     [
-                        0.5455537,
-                        47.2718283
+                        19.3929677,
+                        -34.642015
                     ],
                     [
-                        0.5587737,
-                        47.2720366
+                        19.2877095,
+                        -34.6404784
                     ],
                     [
-                        0.5586259,
-                        47.2765185
+                        19.2861377,
+                        -34.5986563
                     ],
                     [
-                        0.5652252,
-                        47.2766278
+                        19.3474363,
+                        -34.5244458
                     ],
                     [
-                        0.5650848,
-                        47.2811206
+                        19.3285256,
+                        -34.4534372
                     ],
                     [
-                        0.5716753,
-                        47.2812285
+                        19.098001,
+                        -34.449981
                     ],
                     [
-                        0.5715223,
-                        47.2857217
+                        19.0725583,
+                        -34.3802371
                     ],
                     [
-                        0.5781436,
-                        47.2858299
+                        19.0023531,
+                        -34.3525593
                     ],
                     [
-                        0.5779914,
-                        47.2903294
+                        18.9520568,
+                        -34.3949373
                     ],
                     [
-                        0.5846023,
-                        47.2904263
+                        18.7975006,
+                        -34.3936403
                     ],
                     [
-                        0.5843076,
-                        47.2994231
+                        18.7984174,
+                        -34.1016376
                     ],
                     [
-                        0.597499,
-                        47.2996094
+                        18.501748,
+                        -34.1015292
                     ],
                     [
-                        0.5976637,
-                        47.2951375
+                        18.4999545,
+                        -34.3616945
                     ],
                     [
-                        0.6571596,
-                        47.2960036
+                        18.4477325,
+                        -34.3620007
                     ],
                     [
-                        0.6572988,
-                        47.2915091
+                        18.4479944,
+                        -34.3522691
                     ],
                     [
-                        0.6705019,
-                        47.2917186
+                        18.3974362,
+                        -34.3514041
                     ],
                     [
-                        0.6703475,
-                        47.2962082
+                        18.3971742,
+                        -34.3022959
                     ],
                     [
-                        0.6836175,
-                        47.2963688
+                        18.3565705,
+                        -34.3005647
                     ],
                     [
-                        0.6834322,
-                        47.3008929
+                        18.3479258,
+                        -34.2020436
                     ],
                     [
-                        0.690062,
-                        47.3009558
+                        18.2972095,
+                        -34.1950274
                     ],
                     [
-                        0.6899241,
-                        47.3054703
+                        18.2951139,
+                        -33.9937138
                     ],
                     [
-                        0.7362019,
-                        47.3061157
+                        18.3374474,
+                        -33.9914079
                     ],
                     [
-                        0.7360848,
-                        47.3106063
+                        18.3476638,
+                        -33.8492427
                     ],
                     [
-                        0.7559022,
-                        47.3108935
+                        18.3479258,
+                        -33.781555
                     ],
                     [
-                        0.7557718,
-                        47.315392
+                        18.4124718,
+                        -33.7448849
                     ],
                     [
-                        0.7623755,
-                        47.3154716
+                        18.3615477,
+                        -33.6501624
                     ],
                     [
-                        0.7622314,
-                        47.3199941
+                        18.2992013,
+                        -33.585591
                     ],
                     [
-                        0.7754911,
-                        47.3201546
+                        18.2166839,
+                        -33.448872
                     ],
                     [
-                        0.77497,
-                        47.3388218
+                        18.1389858,
+                        -33.3974083
                     ],
                     [
-                        0.7745786,
-                        47.351628
+                        17.9473472,
+                        -33.1602647
                     ],
                     [
-                        0.7680363,
-                        47.3515901
+                        17.8855247,
+                        -33.0575732
                     ],
                     [
-                        0.767589,
-                        47.3605298
+                        17.8485884,
+                        -32.9668505
                     ],
                     [
-                        0.7742443,
-                        47.3606238
-                    ],
+                        17.8396817,
+                        -32.8507302
+                    ]
+                ]
+            ]
+        },
+        {
+            "name": "South Tyrol Orthofoto 2011",
+            "type": "tms",
+            "template": "http://sdi.provincia.bz.it/geoserver/gwc/service/tms/1.0.0/WMTS_OF2011_APB-PAB@GoogleMapsCompatible@png8/{z}/{x}/{-y}.png",
+            "polygon": [
+                [
                     [
-                        0.7733465,
-                        47.3921266
+                        10.373383,
+                        46.213553
                     ],
                     [
-                        0.7667434,
-                        47.3920195
+                        10.373383,
+                        47.098175
                     ],
                     [
-                        0.7664411,
-                        47.4010837
+                        12.482758,
+                        47.098175
                     ],
                     [
-                        0.7730647,
-                        47.4011115
+                        12.482758,
+                        46.213553
                     ],
                     [
-                        0.7728868,
-                        47.4101297
-                    ],
+                        10.373383,
+                        46.213553
+                    ]
+                ]
+            ],
+            "id": "sdi.provinz.bz.it-WMTS_OF2011_APB-PAB"
+        },
+        {
+            "name": "South Tyrol Topomap",
+            "type": "tms",
+            "template": "http://sdi.provincia.bz.it/geoserver/gwc/service/tms/1.0.0/WMTS_TOPOMAP_APB-PAB@GoogleMapsCompatible@png8/{z}/{x}/{-y}.png",
+            "polygon": [
+                [
                     [
-                        0.7661849,
-                        47.4100226
+                        10.373383,
+                        46.213553
                     ],
                     [
-                        0.7660267,
-                        47.4145044
+                        10.373383,
+                        47.098175
                     ],
                     [
-                        0.7527613,
-                        47.4143038
+                        12.482758,
+                        47.098175
                     ],
                     [
-                        0.7529788,
-                        47.4098086
+                        12.482758,
+                        46.213553
                     ],
                     [
-                        0.7462373,
-                        47.4097016
-                    ],
+                        10.373383,
+                        46.213553
+                    ]
+                ]
+            ],
+            "id": "sdi.provinz.bz.it-WMTS_TOPOMAP_APB-PAB"
+        },
+        {
+            "name": "Stadt Uster Orthophoto 2008 10cm",
+            "type": "tms",
+            "template": "http://mapproxy.sosm.ch:8080/tiles/uster/EPSG900913/{zoom}/{x}/{y}.png?origin=nw",
+            "polygon": [
+                [
                     [
-                        0.7459424,
-                        47.4232208
+                        8.6,
+                        47.31
                     ],
                     [
-                        0.7392324,
-                        47.4231451
+                        8.6,
+                        47.39
                     ],
                     [
-                        0.738869,
-                        47.4366116
+                        8.77,
+                        47.39
                     ],
                     [
-                        0.7323267,
-                        47.4365171
+                        8.77,
+                        47.31
                     ],
                     [
-                        0.7321869,
-                        47.4410556
-                    ],
+                        8.6,
+                        47.31
+                    ]
+                ]
+            ],
+            "terms_text": "Stadt Uster Vermessung Orthophoto 2008"
+        },
+        {
+            "name": "Stadt Zürich Luftbild 2011",
+            "type": "tms",
+            "template": "http://mapproxy.sosm.ch:8080/tiles/zh_luftbild2011/EPSG900913/{z}/{x}/{y}.png?origin=nw",
+            "polygon": [
+                [
                     [
-                        0.7255048,
-                        47.44098
+                        8.4441,
+                        47.3141
                     ],
                     [
-                        0.7254209,
-                        47.4453479
+                        8.4441,
+                        47.4411
                     ],
                     [
-                        0.7318793,
-                        47.4454803
+                        8.6284,
+                        47.4411
                     ],
                     [
-                        0.7318514,
-                        47.4501126
+                        8.6284,
+                        47.3141
                     ],
                     [
-                        0.7384496,
-                        47.450226
-                    ],
+                        8.4441,
+                        47.3141
+                    ]
+                ]
+            ],
+            "terms_text": "Stadt Zürich Luftbild 2011"
+        },
+        {
+            "name": "Stevns (Denmark)",
+            "type": "tms",
+            "template": "http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                0,
+                20
+            ],
+            "polygon": [
+                [
                     [
-                        0.7383098,
-                        47.454631
+                        12.0913942,
+                        55.3491574
                     ],
                     [
-                        0.7449359,
-                        47.4547444
+                        12.0943104,
+                        55.3842256
                     ],
                     [
-                        0.7443209,
-                        47.4771985
+                        12.1573875,
+                        55.3833103
                     ],
                     [
-                        0.7310685,
-                        47.4769717
+                        12.1587287,
+                        55.4013326
                     ],
                     [
-                        0.7309008,
-                        47.4815445
+                        12.1903468,
+                        55.400558
                     ],
                     [
-                        0.7176205,
-                        47.4812611
+                        12.1931411,
+                        55.4364665
                     ],
                     [
-                        0.7177883,
-                        47.4768394
+                        12.2564251,
+                        55.4347995
                     ],
                     [
-                        0.69777,
-                        47.4764993
+                        12.2547073,
+                        55.4168882
                     ],
                     [
-                        0.6980496,
-                        47.4719827
+                        12.3822489,
+                        55.4134349
                     ],
                     [
-                        0.6914514,
-                        47.4718882
+                        12.3795942,
+                        55.3954143
                     ],
                     [
-                        0.6917309,
-                        47.4630241
+                        12.4109213,
+                        55.3946958
                     ],
                     [
-                        0.6851048,
-                        47.4629295
+                        12.409403,
+                        55.3766417
                     ],
                     [
-                        0.684937,
-                        47.4673524
+                        12.4407807,
+                        55.375779
                     ],
                     [
-                        0.678255,
-                        47.4673335
+                        12.4394142,
+                        55.3578314
                     ],
                     [
-                        0.6779754,
-                        47.4762158
+                        12.4707413,
+                        55.3569971
                     ],
                     [
-                        0.6714051,
-                        47.4761592
+                        12.4629475,
+                        55.2672214
                     ],
                     [
-                        0.6710417,
-                        47.4881952
+                        12.4315633,
+                        55.2681491
                     ],
                     [
-                        0.6577334,
-                        47.4879685
+                        12.430045,
+                        55.2502103
                     ],
                     [
-                        0.6578173,
-                        47.48504
+                        12.3672011,
+                        55.2519673
                     ],
                     [
-                        0.6511911,
-                        47.4848322
+                        12.3656858,
+                        55.2340267
                     ],
                     [
-                        0.6514707,
-                        47.4758568
+                        12.2714604,
+                        55.2366031
                     ],
                     [
-                        0.6448166,
-                        47.4757245
+                        12.2744467,
+                        55.272476
                     ],
                     [
-                        0.6449284,
-                        47.4712646
+                        12.2115654,
+                        55.2741475
                     ],
                     [
-                        0.6117976,
-                        47.4707543
+                        12.2130078,
+                        55.2920322
                     ],
                     [
-                        0.6118815,
-                        47.4663129
+                        12.1815665,
+                        55.2928638
                     ],
                     [
-                        0.6052833,
-                        47.4661239
+                        12.183141,
+                        55.3107091
                     ],
                     [
-                        0.6054231,
-                        47.4616631
+                        12.2144897,
+                        55.3100981
                     ],
                     [
-                        0.5988808,
-                        47.4615497
+                        12.2159927,
+                        55.3279764
                     ],
                     [
-                        0.5990206,
-                        47.4570886
+                        12.1214458,
+                        55.3303379
                     ],
                     [
-                        0.572488,
-                        47.4566916
-                    ],
-                    [
-                        0.5721805,
-                        47.4656513
+                        12.1229489,
+                        55.3483291
                     ]
                 ]
             ],
-            "terms_url": "http://wiki.openstreetmap.org/wiki/Tours/Orthophoto",
-            "terms_text": "Orthophoto Tour(s) Plus 2008"
+            "terms_text": "Stevns Kommune"
         },
         {
-            "name": "USGS Large Scale Imagery",
+            "name": "Surrey Air Survey",
             "type": "tms",
-            "template": "http://{switch:a,b,c}.tile.openstreetmap.us/usgs_large_scale/{zoom}/{x}/{y}.jpg",
+            "template": "http://gravitystorm.dev.openstreetmap.org/surrey/{zoom}/{x}/{y}.png",
             "scaleExtent": [
-                12,
-                20
+                8,
+                19
             ],
             "polygon": [
                 [
                     [
-                        -123.2549305,
-                        48.7529029
+                        -0.752478,
+                        51.0821941
                     ],
                     [
-                        -123.2549305,
-                        48.5592263
+                        -0.7595183,
+                        51.0856254
                     ],
                     [
-                        -123.192224,
-                        48.5592263
+                        -0.8014342,
+                        51.1457917
                     ],
                     [
-                        -123.192224,
-                        48.4348366
+                        -0.8398864,
+                        51.1440686
                     ],
                     [
-                        -122.9419646,
-                        48.4348366
+                        -0.8357665,
+                        51.1802397
                     ],
                     [
-                        -122.9419646,
-                        48.3720812
+                        -0.8529549,
+                        51.2011266
                     ],
                     [
-                        -122.8806229,
-                        48.3720812
+                        -0.8522683,
+                        51.2096231
                     ],
                     [
-                        -122.8806229,
-                        48.3094763
+                        -0.8495217,
+                        51.217903
                     ],
                     [
-                        -122.8167566,
-                        48.3094763
+                        -0.8266907,
+                        51.2403696
                     ],
                     [
-                        -122.8167566,
-                        48.1904587
+                        -0.8120995,
+                        51.2469248
                     ],
                     [
-                        -123.0041133,
-                        48.1904587
+                        -0.7736474,
+                        51.2459577
                     ],
                     [
-                        -123.0041133,
-                        48.1275918
+                        -0.7544213,
+                        51.2381127
                     ],
                     [
-                        -123.058416,
-                        48.1275918
+                        -0.754078,
+                        51.233921
                     ],
                     [
-                        -123.058416,
-                        48.190514
+                        -0.7446366,
+                        51.2333836
                     ],
                     [
-                        -123.254113,
-                        48.190514
+                        -0.7430693,
+                        51.2847178
                     ],
                     [
-                        -123.254113,
-                        48.1274982
+                        -0.751503,
+                        51.3069524
                     ],
                     [
-                        -123.3706593,
-                        48.1274982
+                        -0.7664376,
+                        51.3121032
                     ],
                     [
-                        -123.3706593,
-                        48.1908403
+                        -0.7820588,
+                        51.3270157
                     ],
                     [
-                        -124.0582632,
-                        48.1908403
+                        -0.7815438,
+                        51.3388135
                     ],
                     [
-                        -124.0582632,
-                        48.253442
+                        -0.7374268,
+                        51.3720456
                     ],
                     [
-                        -124.1815163,
-                        48.253442
+                        -0.7192307,
+                        51.3769748
                     ],
                     [
-                        -124.1815163,
-                        48.3164666
+                        -0.6795769,
+                        51.3847961
                     ],
                     [
-                        -124.4319117,
-                        48.3164666
+                        -0.6807786,
+                        51.3901523
                     ],
                     [
-                        -124.4319117,
-                        48.3782613
+                        -0.6531411,
+                        51.3917591
                     ],
                     [
-                        -124.5564618,
-                        48.3782613
+                        -0.6301385,
+                        51.3905808
                     ],
                     [
-                        -124.5564618,
-                        48.4408305
+                        -0.6291085,
+                        51.3970074
                     ],
                     [
-                        -124.7555107,
-                        48.4408305
+                        -0.6234437,
+                        51.3977572
                     ],
                     [
-                        -124.7555107,
-                        48.1914986
+                        -0.613144,
+                        51.4295552
                     ],
                     [
-                        -124.8185282,
-                        48.1914986
+                        -0.6002471,
+                        51.4459121
                     ],
                     [
-                        -124.8185282,
-                        48.1228381
+                        -0.5867081,
+                        51.4445365
                     ],
                     [
-                        -124.7552951,
-                        48.1228381
+                        -0.5762368,
+                        51.453202
                     ],
                     [
-                        -124.7552951,
-                        47.5535253
+                        -0.5626755,
+                        51.4523462
                     ],
                     [
-                        -124.3812108,
-                        47.5535253
+                        -0.547741,
+                        51.4469972
                     ],
                     [
-                        -124.3812108,
-                        47.1218696
+                        -0.5372697,
+                        51.4448575
                     ],
                     [
-                        -124.1928897,
-                        47.1218696
+                        -0.537098,
+                        51.4526671
                     ],
                     [
-                        -124.1928897,
-                        43.7569431
+                        -0.5439644,
+                        51.4545926
                     ],
                     [
-                        -124.4443382,
-                        43.7569431
+                        -0.5405312,
+                        51.4698865
                     ],
                     [
-                        -124.4443382,
-                        43.1425556
+                        -0.5309182,
+                        51.4760881
                     ],
                     [
-                        -124.6398855,
-                        43.1425556
+                        -0.5091172,
+                        51.4744843
                     ],
                     [
-                        -124.6398855,
-                        42.6194503
+                        -0.5086022,
+                        51.4695657
                     ],
                     [
-                        -124.4438525,
-                        42.6194503
+                        -0.4900628,
+                        51.4682825
                     ],
                     [
-                        -124.4438525,
-                        39.8080662
+                        -0.4526406,
+                        51.4606894
                     ],
                     [
-                        -123.8815685,
-                        39.8080662
+                        -0.4486924,
+                        51.4429316
                     ],
                     [
-                        -123.8815685,
-                        39.1102825
+                        -0.4414826,
+                        51.4418616
                     ],
                     [
-                        -123.75805,
-                        39.1102825
+                        -0.4418259,
+                        51.4369394
                     ],
                     [
-                        -123.75805,
-                        38.4968799
+                        -0.4112702,
+                        51.4380095
                     ],
                     [
-                        -123.2702803,
-                        38.4968799
+                        -0.4014855,
+                        51.4279498
                     ],
                     [
-                        -123.2702803,
-                        37.9331905
+                        -0.3807145,
+                        51.4262372
                     ],
                     [
-                        -122.8148084,
-                        37.9331905
+                        -0.3805428,
+                        51.4161749
                     ],
                     [
-                        -122.8148084,
-                        37.8019606
+                        -0.3491288,
+                        51.4138195
                     ],
                     [
-                        -122.5664316,
-                        37.8019606
+                        -0.3274994,
+                        51.4037544
                     ],
                     [
-                        -122.5664316,
-                        36.9319611
+                        -0.3039818,
+                        51.3990424
                     ],
                     [
-                        -121.8784026,
-                        36.9319611
+                        -0.3019219,
+                        51.3754747
                     ],
                     [
-                        -121.8784026,
-                        36.6897596
+                        -0.309475,
+                        51.369688
                     ],
                     [
-                        -122.0034748,
-                        36.6897596
+                        -0.3111916,
+                        51.3529669
                     ],
                     [
-                        -122.0034748,
-                        36.4341056
+                        -0.2955704,
+                        51.3541462
                     ],
                     [
-                        -121.9414159,
-                        36.4341056
+                        -0.2923089,
+                        51.3673303
                     ],
                     [
-                        -121.9414159,
-                        35.9297636
+                        -0.2850991,
+                        51.3680805
                     ],
                     [
-                        -121.5040977,
-                        35.9297636
+                        -0.2787476,
+                        51.3771891
                     ],
                     [
-                        -121.5040977,
-                        35.8100273
+                        -0.2655297,
+                        51.3837247
                     ],
                     [
-                        -121.3790276,
-                        35.8100273
+                        -0.2411538,
+                        51.3847961
                     ],
                     [
-                        -121.3790276,
-                        35.4239164
+                        -0.2123147,
+                        51.3628288
                     ],
                     [
-                        -120.9426515,
-                        35.4239164
+                        -0.2107697,
+                        51.3498578
                     ],
                     [
-                        -120.9426515,
-                        35.1849683
+                        -0.190857,
+                        51.3502867
                     ],
                     [
-                        -120.8171978,
-                        35.1849683
+                        -0.1542931,
+                        51.3338802
                     ],
                     [
-                        -120.8171978,
-                        35.1219894
+                        -0.1496583,
+                        51.3057719
                     ],
                     [
-                        -120.6918447,
-                        35.1219894
+                        -0.1074296,
+                        51.2966491
                     ],
                     [
-                        -120.6918447,
-                        34.4966794
+                        -0.0887185,
+                        51.3099571
                     ],
                     [
-                        -120.5045898,
-                        34.4966794
+                        -0.0878602,
+                        51.3220811
                     ],
                     [
-                        -120.5045898,
-                        34.4339651
+                        -0.0652009,
+                        51.3215448
                     ],
                     [
-                        -120.0078775,
-                        34.4339651
+                        -0.0641709,
+                        51.3264793
                     ],
                     [
-                        -120.0078775,
-                        34.3682626
+                        -0.0519829,
+                        51.3263721
                     ],
                     [
-                        -119.5283517,
-                        34.3682626
+                        -0.0528412,
+                        51.334631
                     ],
                     [
-                        -119.5283517,
-                        34.0576434
+                        -0.0330779,
+                        51.3430876
                     ],
                     [
-                        -119.0060985,
-                        34.0576434
+                        0.0019187,
+                        51.3376339
                     ],
                     [
-                        -119.0060985,
-                        33.9975267
+                        0.0118751,
+                        51.3281956
                     ],
                     [
-                        -118.5046259,
-                        33.9975267
+                        0.013935,
+                        51.2994398
                     ],
                     [
-                        -118.5046259,
-                        33.8694631
+                        0.0202865,
+                        51.2994398
                     ],
                     [
-                        -118.4413209,
-                        33.8694631
+                        0.0240631,
+                        51.3072743
                     ],
                     [
-                        -118.4413209,
-                        33.6865253
+                        0.0331611,
+                        51.3086694
                     ],
                     [
-                        -118.066912,
-                        33.6865253
+                        0.0455207,
+                        51.30545
                     ],
                     [
-                        -118.066912,
-                        33.3063832
+                        0.0523872,
+                        51.2877392
                     ],
                     [
-                        -117.5030045,
-                        33.3063832
+                        0.0616569,
+                        51.2577764
                     ],
                     [
-                        -117.5030045,
-                        33.0500337
+                        0.0640602,
+                        51.2415518
                     ],
                     [
-                        -117.3188195,
-                        33.0500337
+                        0.0462074,
+                        51.2126342
                     ],
                     [
-                        -117.3188195,
-                        32.6205888
+                        0.0407142,
+                        51.2109136
                     ],
                     [
-                        -117.1917023,
-                        32.6205888
+                        0.0448341,
+                        51.1989753
                     ],
                     [
-                        -117.1917023,
-                        32.4974566
+                        0.0494689,
+                        51.1997283
                     ],
                     [
-                        -116.746496,
-                        32.4974566
+                        0.0558204,
+                        51.1944573
                     ],
                     [
-                        -116.746496,
-                        32.5609161
+                        0.0611419,
+                        51.1790713
                     ],
                     [
-                        -115.9970138,
-                        32.5609161
+                        0.0623435,
+                        51.1542061
                     ],
                     [
-                        -115.9970138,
-                        32.6264942
+                        0.0577087,
+                        51.1417146
                     ],
                     [
-                        -114.8808125,
-                        32.6264942
+                        0.0204582,
+                        51.1365447
                     ],
                     [
-                        -114.8808125,
-                        32.4340796
+                        -0.0446015,
+                        51.1336364
                     ],
                     [
-                        -114.6294474,
-                        32.4340796
+                        -0.1566964,
+                        51.1352522
                     ],
                     [
-                        -114.6294474,
-                        32.3731636
+                        -0.1572114,
+                        51.1290043
                     ],
                     [
-                        -114.4447437,
-                        32.3731636
+                        -0.2287942,
+                        51.1183379
                     ],
                     [
-                        -114.4447437,
-                        32.3075418
+                        -0.2473336,
+                        51.1183379
                     ],
                     [
-                        -114.2557628,
-                        32.3075418
+                        -0.2500802,
+                        51.1211394
                     ],
                     [
-                        -114.2557628,
-                        32.2444561
+                        -0.299347,
+                        51.1137042
                     ],
                     [
-                        -114.0680274,
-                        32.2444561
+                        -0.3221779,
+                        51.1119799
                     ],
                     [
-                        -114.0680274,
-                        32.1829113
+                        -0.3223496,
+                        51.1058367
                     ],
                     [
-                        -113.8166499,
-                        32.1829113
+                        -0.3596001,
+                        51.1019563
                     ],
                     [
-                        -113.8166499,
-                        32.1207622
+                        -0.3589135,
+                        51.1113333
                     ],
                     [
-                        -113.6307421,
-                        32.1207622
+                        -0.3863793,
+                        51.1117644
                     ],
                     [
-                        -113.6307421,
-                        32.0565099
+                        -0.3869014,
+                        51.1062516
                     ],
                     [
-                        -113.4417495,
-                        32.0565099
+                        -0.4281001,
+                        51.0947174
                     ],
                     [
-                        -113.4417495,
-                        31.9984372
+                        -0.4856784,
+                        51.0951554
                     ],
                     [
-                        -113.2546027,
-                        31.9984372
+                        -0.487135,
+                        51.0872266
                     ],
                     [
-                        -113.2546027,
-                        31.9325434
+                        -0.5297404,
+                        51.0865404
                     ],
                     [
-                        -113.068072,
-                        31.9325434
+                        -0.5302259,
+                        51.0789914
                     ],
                     [
-                        -113.068072,
-                        31.8718062
+                        -0.61046,
+                        51.076551
                     ],
                     [
-                        -112.8161105,
-                        31.8718062
+                        -0.6099745,
+                        51.080669
                     ],
                     [
-                        -112.8161105,
-                        31.8104171
+                        -0.6577994,
+                        51.0792202
                     ],
                     [
-                        -112.6308756,
-                        31.8104171
+                        -0.6582849,
+                        51.0743394
                     ],
                     [
-                        -112.6308756,
-                        31.7464723
+                        -0.6836539,
+                        51.0707547
                     ],
                     [
-                        -112.4418918,
-                        31.7464723
+                        -0.6997979,
+                        51.070831
                     ],
                     [
-                        -112.4418918,
-                        31.6856001
-                    ],
+                        -0.7296581,
+                        51.0744919
+                    ]
+                ]
+            ]
+        },
+        {
+            "name": "Toulouse - Orthophotoplan 2007",
+            "type": "tms",
+            "template": "http://wms.openstreetmap.fr/tms/1.0.0/toulouse_ortho2007/{zoom}/{x}/{y}",
+            "scaleExtent": [
+                0,
+                22
+            ],
+            "polygon": [
+                [
                     [
-                        -112.257192,
-                        31.6856001
+                        1.1919978,
+                        43.6328791
                     ],
                     [
-                        -112.257192,
-                        31.6210352
+                        1.2015377,
+                        43.6329729
                     ],
                     [
-                        -112.0033787,
-                        31.6210352
+                        1.2011107,
+                        43.6554932
                     ],
                     [
-                        -112.0033787,
-                        31.559584
+                        1.2227985,
+                        43.6557029
                     ],
                     [
-                        -111.815619,
-                        31.559584
+                        1.2226231,
+                        43.6653353
                     ],
                     [
-                        -111.815619,
-                        31.4970238
+                        1.2275341,
+                        43.6653849
                     ],
                     [
-                        -111.6278586,
-                        31.4970238
+                        1.2275417,
+                        43.6656387
                     ],
                     [
-                        -111.6278586,
-                        31.4339867
+                        1.2337568,
+                        43.6656883
                     ],
                     [
-                        -111.4418978,
-                        31.4339867
+                        1.2337644,
+                        43.6650153
                     ],
                     [
-                        -111.4418978,
-                        31.3733859
+                        1.2351218,
+                        43.6650319
                     ],
                     [
-                        -111.2559708,
-                        31.3733859
+                        1.2350913,
+                        43.6670729
                     ],
                     [
-                        -111.2559708,
-                        31.3113225
+                        1.2443566,
+                        43.6671556
                     ],
                     [
-                        -108.1845822,
-                        31.3113225
+                        1.2441584,
+                        43.6743925
                     ],
                     [
-                        -108.1845822,
-                        31.7459502
+                        1.2493973,
+                        43.6744256
                     ],
                     [
-                        -106.5065055,
-                        31.7459502
+                        1.2493973,
+                        43.6746628
                     ],
                     [
-                        -106.5065055,
-                        31.6842308
+                        1.2555666,
+                        43.6747234
                     ],
                     [
-                        -106.3797265,
-                        31.6842308
+                        1.2555742,
+                        43.6744532
                     ],
                     [
-                        -106.3797265,
-                        31.621752
+                        1.2569545,
+                        43.6744697
                     ],
                     [
-                        -106.317434,
-                        31.621752
+                        1.2568782,
+                        43.678529
                     ],
                     [
-                        -106.317434,
-                        31.4968167
+                        1.2874873,
+                        43.6788257
                     ],
                     [
-                        -106.2551769,
-                        31.4968167
+                        1.2870803,
+                        43.7013229
                     ],
                     [
-                        -106.2551769,
-                        31.4344889
+                        1.3088219,
+                        43.7014632
                     ],
                     [
-                        -106.1924698,
-                        31.4344889
+                        1.3086493,
+                        43.7127673
                     ],
                     [
-                        -106.1924698,
-                        31.3721296
+                        1.3303262,
+                        43.7129544
                     ],
                     [
-                        -106.0039212,
-                        31.3721296
+                        1.3300242,
+                        43.7305221
                     ],
                     [
-                        -106.0039212,
-                        31.309328
+                        1.3367106,
+                        43.7305845
                     ],
                     [
-                        -105.9416582,
-                        31.309328
+                        1.3367322,
+                        43.7312235
                     ],
                     [
-                        -105.9416582,
-                        31.2457547
+                        1.3734338,
+                        43.7310456
                     ],
                     [
-                        -105.8798174,
-                        31.2457547
+                        1.3735848,
+                        43.7245772
                     ],
                     [
-                        -105.8798174,
-                        31.1836194
+                        1.4604504,
+                        43.7252947
                     ],
                     [
-                        -105.8162349,
-                        31.1836194
+                        1.4607783,
+                        43.7028034
                     ],
                     [
-                        -105.8162349,
-                        31.1207155
+                        1.4824875,
+                        43.7029516
                     ],
                     [
-                        -105.6921198,
-                        31.1207155
+                        1.4829828,
+                        43.6692071
                     ],
                     [
-                        -105.6921198,
-                        31.0584835
+                        1.5046832,
+                        43.6693616
                     ],
                     [
-                        -105.6302881,
-                        31.0584835
+                        1.5048383,
+                        43.6581174
                     ],
                     [
-                        -105.6302881,
-                        30.9328271
+                        1.5265475,
+                        43.6582656
                     ],
                     [
-                        -105.5044418,
-                        30.9328271
+                        1.5266945,
+                        43.6470298
                     ],
                     [
-                        -105.5044418,
-                        30.8715864
+                        1.548368,
+                        43.6471633
                     ],
                     [
-                        -105.4412973,
-                        30.8715864
+                        1.5485357,
+                        43.6359385
                     ],
                     [
-                        -105.4412973,
-                        30.808463
+                        1.5702172,
+                        43.636082
                     ],
                     [
-                        -105.3781497,
-                        30.808463
+                        1.5705123,
+                        43.6135777
                     ],
                     [
-                        -105.3781497,
-                        30.7471828
+                        1.5488166,
+                        43.6134276
                     ],
                     [
-                        -105.1904658,
-                        30.7471828
+                        1.549097,
+                        43.5909479
                     ],
                     [
-                        -105.1904658,
-                        30.6843231
+                        1.5707695,
+                        43.5910694
                     ],
                     [
-                        -105.1286244,
-                        30.6843231
+                        1.5709373,
+                        43.5798341
                     ],
                     [
-                        -105.1286244,
-                        30.6199737
+                        1.5793714,
+                        43.5798894
                     ],
                     [
-                        -105.0036504,
-                        30.6199737
+                        1.5794782,
+                        43.5737682
                     ],
                     [
-                        -105.0036504,
-                        30.5589058
+                        1.5809119,
+                        43.5737792
                     ],
                     [
-                        -104.9417962,
-                        30.5589058
+                        1.5810859,
+                        43.5573794
                     ],
                     [
-                        -104.9417962,
-                        30.4963236
+                        1.5712334,
+                        43.5573131
                     ],
                     [
-                        -104.8782018,
-                        30.4963236
+                        1.5716504,
+                        43.5235497
                     ],
                     [
-                        -104.8782018,
-                        30.3098261
+                        1.3984804,
+                        43.5222618
                     ],
                     [
-                        -104.8155257,
-                        30.3098261
+                        1.3986509,
+                        43.5110113
                     ],
                     [
-                        -104.8155257,
-                        30.2478305
+                        1.3120959,
+                        43.5102543
                     ],
                     [
-                        -104.7536079,
-                        30.2478305
+                        1.3118968,
+                        43.5215192
                     ],
                     [
-                        -104.7536079,
-                        29.9353916
+                        1.2902569,
+                        43.5213126
                     ],
                     [
-                        -104.690949,
-                        29.9353916
+                        1.2898637,
+                        43.5438168
                     ],
                     [
-                        -104.690949,
-                        29.8090156
+                        1.311517,
+                        43.5440133
                     ],
                     [
-                        -104.6291301,
-                        29.8090156
+                        1.3113271,
+                        43.5552596
                     ],
                     [
-                        -104.6291301,
-                        29.6843577
+                        1.3036924,
+                        43.5551924
                     ],
                     [
-                        -104.5659869,
-                        29.6843577
+                        1.3036117,
+                        43.5595099
                     ],
                     [
-                        -104.5659869,
-                        29.6223459
+                        1.2955449,
+                        43.5594317
                     ],
                     [
-                        -104.5037188,
-                        29.6223459
+                        1.2955449,
+                        43.5595489
                     ],
                     [
-                        -104.5037188,
-                        29.5595436
+                        1.2895595,
+                        43.5594473
                     ],
                     [
-                        -104.4410072,
-                        29.5595436
+                        1.2892899,
+                        43.5775366
                     ],
                     [
-                        -104.4410072,
-                        29.4974832
+                        1.2675698,
+                        43.5773647
                     ],
                     [
-                        -104.2537551,
-                        29.4974832
+                        1.2673973,
+                        43.5886141
                     ],
                     [
-                        -104.2537551,
-                        29.3716718
+                        1.25355,
+                        43.5885047
                     ],
                     [
-                        -104.1291984,
-                        29.3716718
+                        1.2533774,
+                        43.5956282
                     ],
                     [
-                        -104.1291984,
-                        29.3091621
+                        1.2518029,
+                        43.5956282
                     ],
                     [
-                        -104.0688737,
-                        29.3091621
+                        1.2518029,
+                        43.5949409
                     ],
                     [
-                        -104.0688737,
-                        29.2467276
+                        1.2350437,
+                        43.5947847
                     ],
                     [
-                        -103.8187309,
-                        29.2467276
+                        1.2350437,
+                        43.5945972
                     ],
                     [
-                        -103.8187309,
-                        29.1843076
+                        1.2239572,
+                        43.5945972
                     ],
                     [
-                        -103.755736,
-                        29.1843076
+                        1.2239357,
+                        43.5994708
                     ],
                     [
-                        -103.755736,
-                        29.1223174
+                        1.2139708,
+                        43.599299
                     ],
                     [
-                        -103.5667542,
-                        29.1223174
+                        1.2138845,
+                        43.6046408
                     ],
                     [
-                        -103.5667542,
-                        29.0598119
+                        1.2020647,
+                        43.6044846
                     ],
                     [
-                        -103.5049819,
-                        29.0598119
+                        1.2019464,
+                        43.61048
                     ],
                     [
-                        -103.5049819,
-                        28.9967506
-                    ],
+                        1.1924294,
+                        43.6103695
+                    ]
+                ]
+            ],
+            "terms_url": "https://wiki.openstreetmap.org/wiki/Toulouse/ToulouseMetropoleData",
+            "terms_text": "ToulouseMetropole"
+        },
+        {
+            "name": "Toulouse - Orthophotoplan 2011",
+            "type": "tms",
+            "template": "http://wms.openstreetmap.fr/tms/1.0.0/toulouse_ortho2011/{zoom}/{x}/{y}",
+            "scaleExtent": [
+                0,
+                22
+            ],
+            "polygon": [
+                [
                     [
-                        -103.3165753,
-                        28.9967506
+                        1.1135067,
+                        43.6867566
                     ],
                     [
-                        -103.3165753,
-                        28.9346923
+                        1.1351836,
+                        43.6870842
                     ],
                     [
-                        -103.0597572,
-                        28.9346923
+                        1.1348907,
+                        43.6983471
                     ],
                     [
-                        -103.0597572,
-                        29.0592965
+                        1.1782867,
+                        43.6990338
                     ],
                     [
-                        -102.9979694,
-                        29.0592965
+                        1.1779903,
+                        43.7102786
                     ],
                     [
-                        -102.9979694,
-                        29.1212855
+                        1.1996591,
+                        43.7106144
                     ],
                     [
-                        -102.9331397,
-                        29.1212855
+                        1.1993387,
+                        43.7218722
                     ],
                     [
-                        -102.9331397,
-                        29.1848575
+                        1.2427356,
+                        43.7225269
                     ],
                     [
-                        -102.8095989,
-                        29.1848575
+                        1.2424336,
+                        43.7337491
                     ],
                     [
-                        -102.8095989,
-                        29.2526154
+                        1.2641536,
+                        43.734092
                     ],
                     [
-                        -102.8701345,
-                        29.2526154
+                        1.2638301,
+                        43.7453588
                     ],
                     [
-                        -102.8701345,
-                        29.308096
+                        1.2855285,
+                        43.7456548
                     ],
                     [
-                        -102.8096681,
-                        29.308096
+                        1.2852481,
+                        43.756935
                     ],
                     [
-                        -102.8096681,
-                        29.3715484
+                        1.306925,
+                        43.757231
                     ],
                     [
-                        -102.7475655,
-                        29.3715484
+                        1.3066446,
+                        43.7684779
                     ],
                     [
-                        -102.7475655,
-                        29.5581899
+                        1.3283431,
+                        43.7687894
                     ],
                     [
-                        -102.684554,
-                        29.5581899
+                        1.3280842,
+                        43.780034
                     ],
                     [
-                        -102.684554,
-                        29.6847655
+                        1.4367275,
+                        43.7815757
                     ],
                     [
-                        -102.4967764,
-                        29.6847655
+                        1.4373098,
+                        43.7591004
                     ],
                     [
-                        -102.4967764,
-                        29.7457694
+                        1.4590083,
+                        43.7593653
                     ],
                     [
-                        -102.3086647,
-                        29.7457694
+                        1.4593318,
+                        43.7481479
                     ],
                     [
-                        -102.3086647,
-                        29.8086627
+                        1.4810303,
+                        43.7483972
                     ],
                     [
-                        -102.1909323,
-                        29.8086627
+                        1.4813322,
+                        43.7371777
                     ],
                     [
-                        -102.1909323,
-                        29.7460097
+                        1.5030307,
+                        43.7374115
                     ],
                     [
-                        -101.5049914,
-                        29.7460097
+                        1.5035915,
+                        43.7149664
                     ],
                     [
-                        -101.5049914,
-                        29.6846777
+                        1.5253115,
+                        43.7151846
                     ],
                     [
-                        -101.3805796,
-                        29.6846777
+                        1.5256135,
+                        43.7040057
                     ],
                     [
-                        -101.3805796,
-                        29.5594459
+                        1.5472688,
+                        43.7042552
                     ],
                     [
-                        -101.3175057,
-                        29.5594459
+                        1.5475708,
+                        43.6930431
                     ],
                     [
-                        -101.3175057,
-                        29.4958934
+                        1.5692045,
+                        43.6932926
                     ],
                     [
-                        -101.1910075,
-                        29.4958934
+                        1.5695712,
+                        43.6820316
                     ],
                     [
-                        -101.1910075,
-                        29.4326115
+                        1.5912049,
+                        43.6822656
                     ],
                     [
-                        -101.067501,
-                        29.4326115
+                        1.5917441,
+                        43.6597998
                     ],
                     [
-                        -101.067501,
-                        29.308808
+                        1.613421,
+                        43.6600339
                     ],
                     [
-                        -100.9418897,
-                        29.308808
+                        1.613723,
+                        43.6488291
                     ],
                     [
-                        -100.9418897,
-                        29.2456231
+                        1.6353783,
+                        43.6490788
                     ],
                     [
-                        -100.8167271,
-                        29.2456231
+                        1.6384146,
+                        43.5140731
                     ],
                     [
-                        -100.8167271,
-                        29.1190449
+                        1.2921649,
+                        43.5094658
                     ],
                     [
-                        -100.7522672,
-                        29.1190449
+                        1.2918629,
+                        43.5206966
                     ],
                     [
-                        -100.7522672,
-                        29.0578214
+                        1.2702076,
+                        43.5203994
                     ],
                     [
-                        -100.6925358,
-                        29.0578214
+                        1.2698841,
+                        43.5316437
                     ],
                     [
-                        -100.6925358,
-                        28.8720431
+                        1.2482288,
+                        43.531331
                     ],
                     [
-                        -100.6290158,
-                        28.8720431
+                        1.2476048,
+                        43.5537788
                     ],
                     [
-                        -100.6290158,
-                        28.8095363
+                        1.2259628,
+                        43.5534914
                     ],
                     [
-                        -100.5679901,
-                        28.8095363
+                        1.2256819,
+                        43.564716
                     ],
                     [
-                        -100.5679901,
-                        28.622554
+                        1.2039835,
+                        43.564419
                     ],
                     [
-                        -100.5040411,
-                        28.622554
+                        1.2033148,
+                        43.5869049
                     ],
                     [
-                        -100.5040411,
-                        28.5583804
+                        1.1816164,
+                        43.5865611
                     ],
                     [
-                        -100.4421832,
-                        28.5583804
+                        1.1810237,
+                        43.6090368
                     ],
                     [
-                        -100.4421832,
-                        28.4968266
+                        1.1592821,
+                        43.6086932
                     ],
                     [
-                        -100.379434,
-                        28.4968266
+                        1.1589585,
+                        43.6199523
                     ],
                     [
-                        -100.379434,
-                        28.3092865
+                        1.1372601,
+                        43.6196244
                     ],
                     [
-                        -100.3171942,
-                        28.3092865
+                        1.1365933,
+                        43.642094
                     ],
                     [
-                        -100.3171942,
-                        28.1835681
-                    ],
+                        1.1149055,
+                        43.6417629
+                    ]
+                ]
+            ],
+            "terms_url": "https://wiki.openstreetmap.org/wiki/Toulouse/ToulouseMetropoleData",
+            "terms_text": "ToulouseMetropole"
+        },
+        {
+            "name": "Tours - Orthophotos 2008",
+            "type": "tms",
+            "template": "http://tms.mapspot.ge/tms/2/nonstandard/{zoom}/{x}/{y}.jpeg",
+            "polygon": [
+                [
                     [
-                        -100.254483,
-                        28.1835681
+                        0.5457462,
+                        47.465264
                     ],
                     [
-                        -100.254483,
-                        28.1213885
+                        0.54585,
+                        47.4608163
                     ],
                     [
-                        -100.1282282,
-                        28.1213885
+                        0.5392188,
+                        47.4606983
                     ],
                     [
-                        -100.1282282,
-                        28.059215
+                        0.5393484,
+                        47.456243
                     ],
                     [
-                        -100.0659537,
-                        28.059215
+                        0.5327959,
+                        47.4561003
                     ],
                     [
-                        -100.0659537,
-                        27.9966087
+                        0.5329011,
+                        47.451565
                     ],
                     [
-                        -100.0023855,
-                        27.9966087
+                        0.52619,
+                        47.4514013
                     ],
                     [
-                        -100.0023855,
-                        27.9332152
+                        0.5265854,
+                        47.4424884
                     ],
                     [
-                        -99.9426497,
-                        27.9332152
+                        0.5000941,
+                        47.4420739
                     ],
                     [
-                        -99.9426497,
-                        27.7454658
+                        0.5002357,
+                        47.4375835
                     ],
                     [
-                        -99.816851,
-                        27.7454658
+                        0.4936014,
+                        47.4374324
                     ],
                     [
-                        -99.816851,
-                        27.6834301
+                        0.4937,
+                        47.4329285
                     ],
                     [
-                        -99.7541346,
-                        27.6834301
+                        0.4606141,
+                        47.4324593
                     ],
                     [
-                        -99.7541346,
-                        27.6221543
+                        0.4607248,
+                        47.4279827
                     ],
                     [
-                        -99.6291629,
-                        27.6221543
+                        0.4541016,
+                        47.4278125
                     ],
                     [
-                        -99.6291629,
-                        27.5588977
+                        0.454932,
+                        47.4053921
                     ],
                     [
-                        -99.5672838,
-                        27.5588977
+                        0.4615431,
+                        47.4054476
                     ],
                     [
-                        -99.5672838,
-                        27.4353752
+                        0.4619097,
+                        47.3964924
                     ],
                     [
-                        -99.5041798,
-                        27.4353752
+                        0.4684346,
+                        47.3966005
                     ],
                     [
-                        -99.5041798,
-                        27.3774021
+                        0.4691319,
+                        47.3786415
                     ],
                     [
-                        -99.5671796,
-                        27.3774021
+                        0.4757125,
+                        47.3787609
                     ],
                     [
-                        -99.5671796,
-                        27.2463726
+                        0.4762116,
+                        47.3652018
                     ],
                     [
-                        -99.504975,
-                        27.2463726
+                        0.4828297,
+                        47.3653499
                     ],
                     [
-                        -99.504975,
-                        26.9965649
+                        0.4832223,
+                        47.3518574
                     ],
                     [
-                        -99.4427427,
-                        26.9965649
+                        0.5097927,
+                        47.3522592
                     ],
                     [
-                        -99.4427427,
-                        26.872803
+                        0.5095688,
+                        47.3567713
                     ],
                     [
-                        -99.3800633,
-                        26.872803
+                        0.5227698,
+                        47.3569785
                     ],
                     [
-                        -99.3800633,
-                        26.8068179
+                        0.5226429,
+                        47.3614867
                     ],
                     [
-                        -99.3190684,
-                        26.8068179
+                        0.5490721,
+                        47.3618878
                     ],
                     [
-                        -99.3190684,
-                        26.7473614
+                        0.5489087,
+                        47.3663307
                     ],
                     [
-                        -99.2537541,
-                        26.7473614
+                        0.5555159,
+                        47.3664985
                     ],
                     [
-                        -99.2537541,
-                        26.6210068
+                        0.5559105,
+                        47.3575522
                     ],
                     [
-                        -99.1910617,
-                        26.6210068
+                        0.6152789,
+                        47.358407
                     ],
                     [
-                        -99.1910617,
-                        26.4956737
+                        0.6152963,
+                        47.362893
                     ],
                     [
-                        -99.1300639,
-                        26.4956737
+                        0.6285093,
+                        47.3630936
                     ],
                     [
-                        -99.1300639,
-                        26.3713808
+                        0.6288256,
+                        47.353987
                     ],
                     [
-                        -99.0029473,
-                        26.3713808
+                        0.6155012,
+                        47.3538823
                     ],
                     [
-                        -99.0029473,
-                        26.3093836
+                        0.6157682,
+                        47.3493424
                     ],
                     [
-                        -98.816572,
-                        26.3093836
+                        0.6090956,
+                        47.3492991
                     ],
                     [
-                        -98.816572,
-                        26.2457762
+                        0.6094735,
+                        47.3402962
                     ],
                     [
-                        -98.6920082,
-                        26.2457762
+                        0.6160477,
+                        47.3404448
                     ],
                     [
-                        -98.6920082,
-                        26.1837096
+                        0.616083,
+                        47.3369074
                     ],
                     [
-                        -98.4440896,
-                        26.1837096
+                        0.77497,
+                        47.3388218
                     ],
                     [
-                        -98.4440896,
-                        26.1217217
+                        0.7745786,
+                        47.351628
                     ],
                     [
-                        -98.3823181,
-                        26.1217217
+                        0.7680363,
+                        47.3515901
                     ],
                     [
-                        -98.3823181,
-                        26.0596488
+                        0.767589,
+                        47.3605298
                     ],
                     [
-                        -98.2532707,
-                        26.0596488
+                        0.7742443,
+                        47.3606238
                     ],
                     [
-                        -98.2532707,
-                        25.9986871
+                        0.7733465,
+                        47.3921266
                     ],
                     [
-                        -98.0109084,
-                        25.9986871
+                        0.7667434,
+                        47.3920195
                     ],
                     [
-                        -98.0109084,
-                        25.9932255
+                        0.7664411,
+                        47.4010837
                     ],
                     [
-                        -97.6932319,
-                        25.9932255
+                        0.7730647,
+                        47.4011115
                     ],
                     [
-                        -97.6932319,
-                        25.9334103
+                        0.7728868,
+                        47.4101297
                     ],
                     [
-                        -97.6313904,
-                        25.9334103
+                        0.7661849,
+                        47.4100226
                     ],
                     [
-                        -97.6313904,
-                        25.8695893
+                        0.7660267,
+                        47.4145044
                     ],
                     [
-                        -97.5046779,
-                        25.8695893
+                        0.7527613,
+                        47.4143038
                     ],
                     [
-                        -97.5046779,
-                        25.8073488
+                        0.7529788,
+                        47.4098086
                     ],
                     [
-                        -97.3083401,
-                        25.8073488
+                        0.7462373,
+                        47.4097016
                     ],
                     [
-                        -97.3083401,
-                        25.8731159
+                        0.7459424,
+                        47.4232208
                     ],
                     [
-                        -97.2456326,
-                        25.8731159
+                        0.7392324,
+                        47.4231451
                     ],
                     [
-                        -97.2456326,
-                        25.9353731
+                        0.738869,
+                        47.4366116
                     ],
                     [
-                        -97.1138939,
-                        25.9353731
+                        0.7323267,
+                        47.4365171
                     ],
                     [
-                        -97.1138939,
-                        27.6809179
+                        0.7321869,
+                        47.4410556
                     ],
                     [
-                        -97.0571035,
-                        27.6809179
+                        0.7255048,
+                        47.44098
                     ],
                     [
-                        -97.0571035,
-                        27.8108242
+                        0.7254209,
+                        47.4453479
                     ],
                     [
-                        -95.5810766,
-                        27.8108242
+                        0.7318793,
+                        47.4454803
                     ],
                     [
-                        -95.5810766,
-                        28.7468827
+                        0.7318514,
+                        47.4501126
                     ],
                     [
-                        -94.271041,
-                        28.7468827
+                        0.7384496,
+                        47.450226
                     ],
                     [
-                        -94.271041,
-                        29.5594076
+                        0.7383098,
+                        47.454631
                     ],
                     [
-                        -92.5029947,
-                        29.5594076
+                        0.7449359,
+                        47.4547444
                     ],
                     [
-                        -92.5029947,
-                        29.4974754
+                        0.7443209,
+                        47.4771985
                     ],
                     [
-                        -91.8776216,
-                        29.4974754
+                        0.7310685,
+                        47.4769717
                     ],
                     [
-                        -91.8776216,
-                        29.3727013
+                        0.7309008,
+                        47.4815445
                     ],
                     [
-                        -91.378418,
-                        29.3727013
+                        0.7176205,
+                        47.4812611
                     ],
                     [
-                        -91.378418,
-                        29.2468326
+                        0.7177883,
+                        47.4768394
                     ],
                     [
-                        -91.3153953,
-                        29.2468326
+                        0.69777,
+                        47.4764993
                     ],
                     [
-                        -91.3153953,
-                        29.1844301
+                        0.6980496,
+                        47.4719827
                     ],
                     [
-                        -91.1294702,
-                        29.1844301
+                        0.6914514,
+                        47.4718882
                     ],
                     [
-                        -91.1294702,
-                        29.1232559
+                        0.6917309,
+                        47.4630241
                     ],
                     [
-                        -91.0052632,
-                        29.1232559
+                        0.6851048,
+                        47.4629295
                     ],
                     [
-                        -91.0052632,
-                        28.9968437
+                        0.684937,
+                        47.4673524
                     ],
                     [
-                        -89.4500159,
-                        28.9968437
+                        0.678255,
+                        47.4673335
                     ],
                     [
-                        -89.4500159,
-                        28.8677422
+                        0.6779754,
+                        47.4762158
                     ],
                     [
-                        -88.8104309,
-                        28.8677422
+                        0.6714051,
+                        47.4761592
                     ],
                     [
-                        -88.8104309,
-                        30.1841864
+                        0.6710417,
+                        47.4881952
                     ],
                     [
-                        -85.8791527,
-                        30.1841864
+                        0.6577334,
+                        47.4879685
                     ],
                     [
-                        -85.8791527,
-                        29.5455038
+                        0.6578173,
+                        47.48504
                     ],
                     [
-                        -84.8368083,
-                        29.5455038
+                        0.6511911,
+                        47.4848322
                     ],
                     [
-                        -84.8368083,
-                        29.6225158
+                        0.6514707,
+                        47.4758568
                     ],
                     [
-                        -84.7482786,
-                        29.6225158
+                        0.6448166,
+                        47.4757245
                     ],
                     [
-                        -84.7482786,
-                        29.683624
+                        0.6449284,
+                        47.4712646
                     ],
                     [
-                        -84.685894,
-                        29.683624
+                        0.6117976,
+                        47.4707543
                     ],
                     [
-                        -84.685894,
-                        29.7468386
+                        0.6118815,
+                        47.4663129
                     ],
                     [
-                        -83.6296975,
-                        29.7468386
+                        0.6052833,
+                        47.4661239
                     ],
                     [
-                        -83.6296975,
-                        29.4324361
+                        0.6054231,
+                        47.4616631
                     ],
                     [
-                        -83.3174937,
-                        29.4324361
+                        0.5988808,
+                        47.4615497
                     ],
                     [
-                        -83.3174937,
-                        29.0579442
+                        0.5990206,
+                        47.4570886
                     ],
                     [
-                        -82.879659,
-                        29.0579442
+                        0.572488,
+                        47.4566916
                     ],
                     [
-                        -82.879659,
-                        27.7453529
+                        0.5721805,
+                        47.4656513
+                    ]
+                ]
+            ],
+            "terms_url": "http://wiki.openstreetmap.org/wiki/Tours/Orthophoto",
+            "terms_text": "Orthophoto Tour(s) Plus 2008"
+        },
+        {
+            "name": "Tours - Orthophotos 2008-2010",
+            "type": "tms",
+            "template": "http://wms.openstreetmap.fr/tms/1.0.0/tours/{zoom}/{x}/{y}",
+            "scaleExtent": [
+                0,
+                20
+            ],
+            "polygon": [
+                [
+                    [
+                        0.5457462,
+                        47.465264
                     ],
                     [
-                        -82.8182822,
-                        27.7453529
+                        0.54585,
+                        47.4608163
                     ],
                     [
-                        -82.8182822,
-                        26.9290868
+                        0.5392188,
+                        47.4606983
                     ],
                     [
-                        -82.3796782,
-                        26.9290868
+                        0.5393484,
+                        47.456243
                     ],
                     [
-                        -82.3796782,
-                        26.3694183
+                        0.5327959,
+                        47.4561003
                     ],
                     [
-                        -81.8777106,
-                        26.3694183
+                        0.5329011,
+                        47.451565
                     ],
                     [
-                        -81.8777106,
-                        25.805971
+                        0.52619,
+                        47.4514013
                     ],
                     [
-                        -81.5036862,
-                        25.805971
+                        0.5265854,
+                        47.4424884
                     ],
                     [
-                        -81.5036862,
-                        25.7474753
+                        0.5000941,
+                        47.4420739
                     ],
                     [
-                        -81.4405462,
-                        25.7474753
+                        0.5002357,
+                        47.4375835
                     ],
                     [
-                        -81.4405462,
-                        25.6851489
+                        0.4936014,
+                        47.4374324
                     ],
                     [
-                        -81.3155883,
-                        25.6851489
+                        0.4937,
+                        47.4329285
                     ],
                     [
-                        -81.3155883,
-                        25.5600985
+                        0.4606141,
+                        47.4324593
                     ],
                     [
-                        -81.2538534,
-                        25.5600985
+                        0.4607248,
+                        47.4279827
                     ],
                     [
-                        -81.2538534,
-                        25.4342361
+                        0.4541016,
+                        47.4278125
                     ],
                     [
-                        -81.1902012,
-                        25.4342361
+                        0.454932,
+                        47.4053921
                     ],
                     [
-                        -81.1902012,
-                        25.1234341
+                        0.4615431,
+                        47.4054476
                     ],
                     [
-                        -81.1288133,
-                        25.1234341
+                        0.4619097,
+                        47.3964924
                     ],
                     [
-                        -81.1288133,
-                        25.0619389
+                        0.4684346,
+                        47.3966005
                     ],
                     [
-                        -81.0649231,
-                        25.0619389
+                        0.4691319,
+                        47.3786415
                     ],
                     [
-                        -81.0649231,
-                        24.8157807
+                        0.4757125,
+                        47.3787609
                     ],
                     [
-                        -81.6289469,
-                        24.8157807
+                        0.4762116,
+                        47.3652018
                     ],
                     [
-                        -81.6289469,
-                        24.7538367
+                        0.4828297,
+                        47.3653499
                     ],
                     [
-                        -81.6907173,
-                        24.7538367
+                        0.4829611,
+                        47.3608321
                     ],
                     [
-                        -81.6907173,
-                        24.6899374
+                        0.4763543,
+                        47.360743
                     ],
                     [
-                        -81.8173189,
-                        24.6899374
+                        0.476654,
+                        47.3517263
                     ],
                     [
-                        -81.8173189,
-                        24.6279161
+                        0.4700497,
+                        47.3516186
                     ],
                     [
-                        -82.1910041,
-                        24.6279161
+                        0.4701971,
+                        47.3471313
                     ],
                     [
-                        -82.1910041,
-                        24.496294
+                        0.4637503,
+                        47.3470104
                     ],
                     [
-                        -81.6216596,
-                        24.496294
+                        0.4571425,
+                        47.3424146
                     ],
                     [
-                        -81.6216596,
-                        24.559484
+                        0.4572922,
+                        47.3379061
                     ],
                     [
-                        -81.372006,
-                        24.559484
+                        0.4506741,
+                        47.3378081
                     ],
                     [
-                        -81.372006,
-                        24.6220687
+                        0.4508379,
+                        47.3333051
                     ],
                     [
-                        -81.0593278,
-                        24.6220687
+                        0.4442212,
+                        47.3332032
                     ],
                     [
-                        -81.0593278,
-                        24.684826
+                        0.4443809,
+                        47.328711
                     ],
                     [
-                        -80.9347147,
-                        24.684826
+                        0.4311392,
+                        47.3284977
                     ],
                     [
-                        -80.9347147,
-                        24.7474828
+                        0.4316262,
+                        47.3150004
                     ],
                     [
-                        -80.7471081,
-                        24.7474828
+                        0.4382432,
+                        47.3151136
                     ],
                     [
-                        -80.7471081,
-                        24.8100618
+                        0.4383815,
+                        47.3106174
                     ],
                     [
-                        -80.3629898,
-                        24.8100618
+                        0.4714487,
+                        47.3111374
                     ],
                     [
-                        -80.3629898,
-                        25.1175858
+                        0.4713096,
+                        47.3156565
                     ],
                     [
-                        -80.122344,
-                        25.1175858
+                        0.477888,
+                        47.3157542
                     ],
                     [
-                        -80.122344,
-                        25.7472357
+                        0.4780733,
+                        47.3112802
                     ],
                     [
-                        -80.0588458,
-                        25.7472357
+                        0.4846826,
+                        47.3113639
                     ],
                     [
-                        -80.0588458,
-                        26.3708251
+                        0.4848576,
+                        47.3068686
                     ],
                     [
-                        -79.995837,
-                        26.3708251
+                        0.4914359,
+                        47.3069803
                     ],
                     [
-                        -79.995837,
-                        26.9398003
+                        0.491745,
+                        47.2979733
                     ],
                     [
-                        -80.0587265,
-                        26.9398003
+                        0.4851578,
+                        47.2978722
                     ],
                     [
-                        -80.0587265,
-                        27.1277466
+                        0.4854269,
+                        47.2888744
                     ],
                     [
-                        -80.1226251,
-                        27.1277466
+                        0.4788485,
+                        47.2887697
                     ],
                     [
-                        -80.1226251,
-                        27.2534279
+                        0.4791574,
+                        47.2797818
                     ],
                     [
-                        -80.1846956,
-                        27.2534279
+                        0.4857769,
+                        47.2799005
                     ],
                     [
-                        -80.1846956,
-                        27.3781229
+                        0.4859107,
+                        47.2753885
                     ],
                     [
-                        -80.246175,
-                        27.3781229
+                        0.492539,
+                        47.2755029
                     ],
                     [
-                        -80.246175,
-                        27.5658729
+                        0.4926669,
+                        47.2710127
                     ],
                     [
-                        -80.3094768,
-                        27.5658729
+                        0.4992986,
+                        47.2711066
                     ],
                     [
-                        -80.3094768,
-                        27.7530311
+                        0.4994296,
+                        47.2666116
                     ],
                     [
-                        -80.3721485,
-                        27.7530311
+                        0.5192658,
+                        47.2669245
                     ],
                     [
-                        -80.3721485,
-                        27.8774451
+                        0.5194225,
+                        47.2624231
                     ],
                     [
-                        -80.4351457,
-                        27.8774451
+                        0.5260186,
+                        47.2625205
                     ],
                     [
-                        -80.4351457,
-                        28.0033366
+                        0.5258735,
+                        47.2670183
                     ],
                     [
-                        -80.4966078,
-                        28.0033366
+                        0.5456972,
+                        47.2673383
                     ],
                     [
-                        -80.4966078,
-                        28.1277326
+                        0.5455537,
+                        47.2718283
                     ],
                     [
-                        -80.5587159,
-                        28.1277326
+                        0.5587737,
+                        47.2720366
                     ],
                     [
-                        -80.5587159,
-                        28.3723509
+                        0.5586259,
+                        47.2765185
                     ],
                     [
-                        -80.4966335,
-                        28.3723509
+                        0.5652252,
+                        47.2766278
                     ],
                     [
-                        -80.4966335,
-                        29.5160326
+                        0.5650848,
+                        47.2811206
                     ],
                     [
-                        -81.1213644,
-                        29.5160326
+                        0.5716753,
+                        47.2812285
                     ],
                     [
-                        -81.1213644,
-                        31.6846966
+                        0.5715223,
+                        47.2857217
                     ],
                     [
-                        -80.6018723,
-                        31.6846966
+                        0.5781436,
+                        47.2858299
                     ],
                     [
-                        -80.6018723,
-                        32.2475309
+                        0.5779914,
+                        47.2903294
                     ],
                     [
-                        -79.4921024,
-                        32.2475309
+                        0.5846023,
+                        47.2904263
                     ],
                     [
-                        -79.4921024,
-                        32.9970261
+                        0.5843076,
+                        47.2994231
                     ],
                     [
-                        -79.1116488,
-                        32.9970261
+                        0.597499,
+                        47.2996094
                     ],
                     [
-                        -79.1116488,
-                        33.3729457
+                        0.5976637,
+                        47.2951375
                     ],
                     [
-                        -78.6153621,
-                        33.3729457
+                        0.6571596,
+                        47.2960036
                     ],
                     [
-                        -78.6153621,
-                        33.8097638
+                        0.6572988,
+                        47.2915091
                     ],
                     [
-                        -77.9316963,
-                        33.8097638
+                        0.6705019,
+                        47.2917186
                     ],
                     [
-                        -77.9316963,
-                        33.8718243
+                        0.6703475,
+                        47.2962082
                     ],
                     [
-                        -77.8692252,
-                        33.8718243
+                        0.6836175,
+                        47.2963688
                     ],
                     [
-                        -77.8692252,
-                        34.0552454
+                        0.6834322,
+                        47.3008929
                     ],
                     [
-                        -77.6826392,
-                        34.0552454
+                        0.690062,
+                        47.3009558
                     ],
                     [
-                        -77.6826392,
-                        34.2974598
+                        0.6899241,
+                        47.3054703
                     ],
                     [
-                        -77.2453509,
-                        34.2974598
+                        0.7362019,
+                        47.3061157
                     ],
                     [
-                        -77.2453509,
-                        34.5598585
+                        0.7360848,
+                        47.3106063
                     ],
                     [
-                        -76.4973277,
-                        34.5598585
+                        0.7559022,
+                        47.3108935
                     ],
                     [
-                        -76.4973277,
-                        34.622796
+                        0.7557718,
+                        47.315392
                     ],
                     [
-                        -76.4337602,
-                        34.622796
+                        0.7623755,
+                        47.3154716
                     ],
                     [
-                        -76.4337602,
-                        34.6849285
+                        0.7622314,
+                        47.3199941
                     ],
                     [
-                        -76.373212,
-                        34.6849285
+                        0.7754911,
+                        47.3201546
                     ],
                     [
-                        -76.373212,
-                        34.7467674
+                        0.77497,
+                        47.3388218
                     ],
                     [
-                        -76.3059364,
-                        34.7467674
+                        0.7745786,
+                        47.351628
                     ],
                     [
-                        -76.3059364,
-                        34.808551
+                        0.7680363,
+                        47.3515901
                     ],
                     [
-                        -76.2468017,
-                        34.808551
+                        0.767589,
+                        47.3605298
                     ],
                     [
-                        -76.2468017,
-                        34.8728418
+                        0.7742443,
+                        47.3606238
                     ],
                     [
-                        -76.1825922,
-                        34.8728418
+                        0.7733465,
+                        47.3921266
                     ],
                     [
-                        -76.1825922,
-                        34.9335332
+                        0.7667434,
+                        47.3920195
                     ],
                     [
-                        -76.120814,
-                        34.9335332
+                        0.7664411,
+                        47.4010837
                     ],
                     [
-                        -76.120814,
-                        34.9952359
+                        0.7730647,
+                        47.4011115
                     ],
                     [
-                        -75.9979015,
-                        34.9952359
+                        0.7728868,
+                        47.4101297
                     ],
                     [
-                        -75.9979015,
-                        35.0578182
+                        0.7661849,
+                        47.4100226
                     ],
                     [
-                        -75.870338,
-                        35.0578182
+                        0.7660267,
+                        47.4145044
                     ],
                     [
-                        -75.870338,
-                        35.1219097
+                        0.7527613,
+                        47.4143038
                     ],
                     [
-                        -75.7462194,
-                        35.1219097
+                        0.7529788,
+                        47.4098086
                     ],
                     [
-                        -75.7462194,
-                        35.1818911
+                        0.7462373,
+                        47.4097016
                     ],
                     [
-                        -75.4929694,
-                        35.1818911
+                        0.7459424,
+                        47.4232208
                     ],
                     [
-                        -75.4929694,
-                        35.3082988
+                        0.7392324,
+                        47.4231451
                     ],
                     [
-                        -75.4325662,
-                        35.3082988
+                        0.738869,
+                        47.4366116
                     ],
                     [
-                        -75.4325662,
-                        35.7542495
+                        0.7323267,
+                        47.4365171
                     ],
                     [
-                        -75.4969907,
-                        35.7542495
+                        0.7321869,
+                        47.4410556
                     ],
                     [
-                        -75.4969907,
-                        37.8105602
+                        0.7255048,
+                        47.44098
                     ],
                     [
-                        -75.3082972,
-                        37.8105602
+                        0.7254209,
+                        47.4453479
                     ],
                     [
-                        -75.3082972,
-                        37.8720088
+                        0.7318793,
+                        47.4454803
                     ],
                     [
-                        -75.245601,
-                        37.8720088
+                        0.7318514,
+                        47.4501126
                     ],
                     [
-                        -75.245601,
-                        37.9954849
+                        0.7384496,
+                        47.450226
                     ],
                     [
-                        -75.1828751,
-                        37.9954849
+                        0.7383098,
+                        47.454631
                     ],
                     [
-                        -75.1828751,
-                        38.0585079
+                        0.7449359,
+                        47.4547444
                     ],
                     [
-                        -75.1184793,
-                        38.0585079
+                        0.7443209,
+                        47.4771985
                     ],
                     [
-                        -75.1184793,
-                        38.2469091
+                        0.7310685,
+                        47.4769717
                     ],
                     [
-                        -75.0592098,
-                        38.2469091
+                        0.7309008,
+                        47.4815445
                     ],
                     [
-                        -75.0592098,
-                        38.3704316
+                        0.7176205,
+                        47.4812611
                     ],
                     [
-                        -74.9948111,
-                        38.3704316
+                        0.7177883,
+                        47.4768394
                     ],
                     [
-                        -74.9948111,
-                        38.8718417
+                        0.69777,
+                        47.4764993
                     ],
                     [
-                        -74.4878252,
-                        38.8718417
+                        0.6980496,
+                        47.4719827
                     ],
                     [
-                        -74.4878252,
-                        39.3089428
+                        0.6914514,
+                        47.4718882
                     ],
                     [
-                        -74.1766317,
-                        39.3089428
+                        0.6917309,
+                        47.4630241
                     ],
                     [
-                        -74.1766317,
-                        39.6224653
+                        0.6851048,
+                        47.4629295
                     ],
                     [
-                        -74.0567045,
-                        39.6224653
+                        0.684937,
+                        47.4673524
                     ],
                     [
-                        -74.0567045,
-                        39.933178
+                        0.678255,
+                        47.4673335
                     ],
                     [
-                        -73.9959035,
-                        39.933178
+                        0.6779754,
+                        47.4762158
                     ],
                     [
-                        -73.9959035,
-                        40.1854852
+                        0.6714051,
+                        47.4761592
                     ],
                     [
-                        -73.9341593,
-                        40.1854852
+                        0.6710417,
+                        47.4881952
                     ],
                     [
-                        -73.9341593,
-                        40.4959486
+                        0.6577334,
+                        47.4879685
                     ],
                     [
-                        -73.8723024,
-                        40.4959486
+                        0.6578173,
+                        47.48504
                     ],
                     [
-                        -73.8723024,
-                        40.5527135
+                        0.6511911,
+                        47.4848322
                     ],
                     [
-                        -71.8074506,
-                        40.5527135
+                        0.6514707,
+                        47.4758568
                     ],
                     [
-                        -71.8074506,
-                        41.3088005
+                        0.6448166,
+                        47.4757245
                     ],
                     [
-                        -70.882512,
-                        41.3088005
+                        0.6449284,
+                        47.4712646
                     ],
                     [
-                        -70.882512,
-                        41.184978
+                        0.6117976,
+                        47.4707543
                     ],
                     [
-                        -70.7461947,
-                        41.184978
+                        0.6118815,
+                        47.4663129
                     ],
                     [
-                        -70.7461947,
-                        41.3091865
+                        0.6052833,
+                        47.4661239
                     ],
                     [
-                        -70.4337553,
-                        41.3091865
+                        0.6054231,
+                        47.4616631
                     ],
                     [
-                        -70.4337553,
-                        41.4963885
+                        0.5988808,
+                        47.4615497
                     ],
                     [
-                        -69.9334281,
-                        41.4963885
+                        0.5990206,
+                        47.4570886
                     ],
                     [
-                        -69.9334281,
-                        41.6230802
+                        0.572488,
+                        47.4566916
                     ],
                     [
-                        -69.869857,
-                        41.6230802
+                        0.5721805,
+                        47.4656513
+                    ]
+                ]
+            ],
+            "terms_url": "http://wiki.openstreetmap.org/wiki/Tours/Orthophoto",
+            "terms_text": "Orthophoto Tour(s) Plus 2008"
+        },
+        {
+            "name": "USGS Large Scale Imagery",
+            "type": "tms",
+            "template": "http://{switch:a,b,c}.tile.openstreetmap.us/usgs_large_scale/{zoom}/{x}/{y}.jpg",
+            "scaleExtent": [
+                12,
+                20
+            ],
+            "polygon": [
+                [
+                    [
+                        -123.2549305,
+                        48.7529029
                     ],
                     [
-                        -69.869857,
-                        41.8776895
+                        -123.2549305,
+                        48.5592263
                     ],
                     [
-                        -69.935791,
-                        41.8776895
+                        -123.192224,
+                        48.5592263
                     ],
                     [
-                        -69.935791,
-                        42.0032342
+                        -123.192224,
+                        48.4348366
                     ],
                     [
-                        -69.9975823,
-                        42.0032342
+                        -122.9419646,
+                        48.4348366
                     ],
                     [
-                        -69.9975823,
-                        42.0650191
+                        -122.9419646,
+                        48.3720812
                     ],
                     [
-                        -70.0606103,
-                        42.0650191
+                        -122.8806229,
+                        48.3720812
                     ],
                     [
-                        -70.0606103,
-                        42.1294348
+                        -122.8806229,
+                        48.3094763
                     ],
                     [
-                        -70.5572884,
-                        42.1294348
+                        -122.8167566,
+                        48.3094763
                     ],
                     [
-                        -70.5572884,
-                        43.2487079
+                        -122.8167566,
+                        48.1904587
                     ],
                     [
-                        -70.4974097,
-                        43.2487079
+                        -123.0041133,
+                        48.1904587
                     ],
                     [
-                        -70.4974097,
-                        43.3092194
+                        -123.0041133,
+                        48.1275918
                     ],
                     [
-                        -70.3704249,
-                        43.3092194
+                        -123.058416,
+                        48.1275918
                     ],
                     [
-                        -70.3704249,
-                        43.371963
+                        -123.058416,
+                        48.190514
                     ],
                     [
-                        -70.3085701,
-                        43.371963
+                        -123.254113,
+                        48.190514
                     ],
                     [
-                        -70.3085701,
-                        43.4969879
+                        -123.254113,
+                        48.1274982
                     ],
                     [
-                        -70.183921,
-                        43.4969879
+                        -123.3706593,
+                        48.1274982
                     ],
                     [
-                        -70.183921,
-                        43.6223531
+                        -123.3706593,
+                        48.1908403
                     ],
                     [
-                        -70.057583,
-                        43.6223531
+                        -124.0582632,
+                        48.1908403
                     ],
                     [
-                        -70.057583,
-                        43.6850173
+                        -124.0582632,
+                        48.253442
                     ],
                     [
-                        -69.7455247,
-                        43.6850173
+                        -124.1815163,
+                        48.253442
                     ],
                     [
-                        -69.7455247,
-                        43.7476571
+                        -124.1815163,
+                        48.3164666
                     ],
                     [
-                        -69.2472845,
-                        43.7476571
+                        -124.4319117,
+                        48.3164666
                     ],
                     [
-                        -69.2472845,
-                        43.8107035
+                        -124.4319117,
+                        48.3782613
                     ],
                     [
-                        -69.0560701,
-                        43.8107035
+                        -124.5564618,
+                        48.3782613
                     ],
                     [
-                        -69.0560701,
-                        43.8717247
+                        -124.5564618,
+                        48.4408305
                     ],
                     [
-                        -68.9950522,
-                        43.8717247
+                        -124.7555107,
+                        48.4408305
                     ],
                     [
-                        -68.9950522,
-                        43.9982022
+                        -124.7555107,
+                        48.1914986
                     ],
                     [
-                        -68.4963672,
-                        43.9982022
+                        -124.8185282,
+                        48.1914986
                     ],
                     [
-                        -68.4963672,
-                        44.0597368
+                        -124.8185282,
+                        48.1228381
                     ],
                     [
-                        -68.3081038,
-                        44.0597368
+                        -124.7552951,
+                        48.1228381
                     ],
                     [
-                        -68.3081038,
-                        44.122137
+                        -124.7552951,
+                        47.5535253
                     ],
                     [
-                        -68.1851802,
-                        44.122137
+                        -124.3812108,
+                        47.5535253
                     ],
                     [
-                        -68.1851802,
-                        44.3081382
+                        -124.3812108,
+                        47.1218696
                     ],
                     [
-                        -67.9956019,
-                        44.3081382
+                        -124.1928897,
+                        47.1218696
                     ],
                     [
-                        -67.9956019,
-                        44.3727489
+                        -124.1928897,
+                        43.7569431
                     ],
                     [
-                        -67.8103041,
-                        44.3727489
+                        -124.4443382,
+                        43.7569431
                     ],
                     [
-                        -67.8103041,
-                        44.435178
+                        -124.4443382,
+                        43.1425556
                     ],
                     [
-                        -67.4965289,
-                        44.435178
+                        -124.6398855,
+                        43.1425556
                     ],
                     [
-                        -67.4965289,
-                        44.4968776
+                        -124.6398855,
+                        42.6194503
                     ],
                     [
-                        -67.37102,
-                        44.4968776
+                        -124.4438525,
+                        42.6194503
                     ],
                     [
-                        -67.37102,
-                        44.5600642
+                        -124.4438525,
+                        39.8080662
                     ],
                     [
-                        -67.1848753,
-                        44.5600642
+                        -123.8815685,
+                        39.8080662
                     ],
                     [
-                        -67.1848753,
-                        44.6213345
+                        -123.8815685,
+                        39.1102825
                     ],
                     [
-                        -67.1221208,
-                        44.6213345
+                        -123.75805,
+                        39.1102825
                     ],
                     [
-                        -67.1221208,
-                        44.6867918
+                        -123.75805,
+                        38.4968799
                     ],
                     [
-                        -67.059365,
-                        44.6867918
+                        -123.2702803,
+                        38.4968799
                     ],
                     [
-                        -67.059365,
-                        44.7473657
+                        -123.2702803,
+                        37.9331905
                     ],
                     [
-                        -66.9311098,
-                        44.7473657
+                        -122.8148084,
+                        37.9331905
                     ],
                     [
-                        -66.9311098,
-                        44.9406566
+                        -122.8148084,
+                        37.8019606
                     ],
                     [
-                        -66.994683,
-                        44.9406566
+                        -122.5664316,
+                        37.8019606
                     ],
                     [
-                        -66.994683,
-                        45.0024514
+                        -122.5664316,
+                        36.9319611
                     ],
                     [
-                        -67.0595847,
-                        45.0024514
+                        -121.8784026,
+                        36.9319611
                     ],
                     [
-                        -67.0595847,
-                        45.1273377
+                        -121.8784026,
+                        36.6897596
                     ],
                     [
-                        -67.1201974,
-                        45.1273377
+                        -122.0034748,
+                        36.6897596
                     ],
                     [
-                        -67.1201974,
-                        45.1910115
+                        -122.0034748,
+                        36.4341056
                     ],
                     [
-                        -67.2469811,
-                        45.1910115
+                        -121.9414159,
+                        36.4341056
                     ],
                     [
-                        -67.2469811,
-                        45.253442
+                        -121.9414159,
+                        35.9297636
                     ],
                     [
-                        -67.3177546,
-                        45.253442
+                        -121.5040977,
+                        35.9297636
                     ],
                     [
-                        -67.3177546,
-                        45.1898369
+                        -121.5040977,
+                        35.8100273
                     ],
                     [
-                        -67.370749,
-                        45.1898369
+                        -121.3790276,
+                        35.8100273
                     ],
                     [
-                        -67.370749,
-                        45.2534001
+                        -121.3790276,
+                        35.4239164
                     ],
                     [
-                        -67.4326888,
-                        45.2534001
+                        -120.9426515,
+                        35.4239164
                     ],
                     [
-                        -67.4326888,
-                        45.3083409
+                        -120.9426515,
+                        35.1849683
                     ],
                     [
-                        -67.3708571,
-                        45.3083409
+                        -120.8171978,
+                        35.1849683
                     ],
                     [
-                        -67.3708571,
-                        45.4396986
+                        -120.8171978,
+                        35.1219894
                     ],
                     [
-                        -67.4305573,
-                        45.4396986
+                        -120.6918447,
+                        35.1219894
                     ],
                     [
-                        -67.4305573,
-                        45.4950095
+                        -120.6918447,
+                        34.4966794
                     ],
                     [
-                        -67.37099,
-                        45.4950095
+                        -120.5045898,
+                        34.4966794
                     ],
                     [
-                        -67.37099,
-                        45.6264543
+                        -120.5045898,
+                        34.4339651
                     ],
                     [
-                        -67.6214982,
-                        45.6264543
+                        -120.0078775,
+                        34.4339651
                     ],
                     [
-                        -67.6214982,
-                        45.6896133
+                        -120.0078775,
+                        34.3682626
                     ],
                     [
-                        -67.683828,
-                        45.6896133
+                        -119.5283517,
+                        34.3682626
                     ],
                     [
-                        -67.683828,
-                        45.753259
+                        -119.5283517,
+                        34.0576434
                     ],
                     [
-                        -67.7462097,
-                        45.753259
+                        -119.0060985,
+                        34.0576434
                     ],
                     [
-                        -67.7462097,
-                        47.1268165
+                        -119.0060985,
+                        33.9975267
                     ],
                     [
-                        -67.8700141,
-                        47.1268165
+                        -118.5046259,
+                        33.9975267
                     ],
                     [
-                        -67.8700141,
-                        47.1900278
+                        -118.5046259,
+                        33.8694631
                     ],
                     [
-                        -67.9323803,
-                        47.1900278
+                        -118.4413209,
+                        33.8694631
                     ],
                     [
-                        -67.9323803,
-                        47.2539678
+                        -118.4413209,
+                        33.6865253
                     ],
                     [
-                        -67.9959387,
-                        47.2539678
+                        -118.066912,
+                        33.6865253
                     ],
                     [
-                        -67.9959387,
-                        47.3149737
+                        -118.066912,
+                        33.3063832
                     ],
                     [
-                        -68.1206676,
-                        47.3149737
+                        -117.5030045,
+                        33.3063832
                     ],
                     [
-                        -68.1206676,
-                        47.3780823
+                        -117.5030045,
+                        33.0500337
                     ],
                     [
-                        -68.4423175,
-                        47.3780823
+                        -117.3188195,
+                        33.0500337
                     ],
                     [
-                        -68.4423175,
-                        47.3166082
+                        -117.3188195,
+                        32.6205888
                     ],
                     [
-                        -68.6314305,
-                        47.3166082
+                        -117.1917023,
+                        32.6205888
                     ],
                     [
-                        -68.6314305,
-                        47.2544676
+                        -117.1917023,
+                        32.4974566
                     ],
                     [
-                        -68.9978037,
-                        47.2544676
+                        -116.746496,
+                        32.4974566
                     ],
                     [
-                        -68.9978037,
-                        47.439895
+                        -116.746496,
+                        32.5609161
                     ],
                     [
-                        -69.0607223,
-                        47.439895
+                        -115.9970138,
+                        32.5609161
                     ],
                     [
-                        -69.0607223,
-                        47.5047558
+                        -115.9970138,
+                        32.6264942
                     ],
                     [
-                        -69.2538122,
-                        47.5047558
+                        -114.8808125,
+                        32.6264942
                     ],
                     [
-                        -69.2538122,
-                        47.4398084
+                        -114.8808125,
+                        32.4340796
                     ],
                     [
-                        -69.3179284,
-                        47.4398084
+                        -114.6294474,
+                        32.4340796
                     ],
                     [
-                        -69.3179284,
-                        47.378601
+                        -114.6294474,
+                        32.3731636
                     ],
                     [
-                        -69.4438546,
-                        47.378601
+                        -114.4447437,
+                        32.3731636
                     ],
                     [
-                        -69.4438546,
-                        47.3156274
+                        -114.4447437,
+                        32.3075418
                     ],
                     [
-                        -69.5038204,
-                        47.3156274
+                        -114.2557628,
+                        32.3075418
                     ],
                     [
-                        -69.5038204,
-                        47.2525839
+                        -114.2557628,
+                        32.2444561
                     ],
                     [
-                        -69.5667838,
-                        47.2525839
+                        -114.0680274,
+                        32.2444561
                     ],
                     [
-                        -69.5667838,
-                        47.1910884
+                        -114.0680274,
+                        32.1829113
                     ],
                     [
-                        -69.6303478,
-                        47.1910884
+                        -113.8166499,
+                        32.1829113
                     ],
                     [
-                        -69.6303478,
-                        47.128701
+                        -113.8166499,
+                        32.1207622
                     ],
                     [
-                        -69.6933103,
-                        47.128701
+                        -113.6307421,
+                        32.1207622
                     ],
                     [
-                        -69.6933103,
-                        47.0654307
+                        -113.6307421,
+                        32.0565099
                     ],
                     [
-                        -69.7557063,
-                        47.0654307
+                        -113.4417495,
+                        32.0565099
                     ],
                     [
-                        -69.7557063,
-                        47.0042751
+                        -113.4417495,
+                        31.9984372
                     ],
                     [
-                        -69.8180391,
-                        47.0042751
+                        -113.2546027,
+                        31.9984372
                     ],
                     [
-                        -69.8180391,
-                        46.9415344
+                        -113.2546027,
+                        31.9325434
                     ],
                     [
-                        -69.8804023,
-                        46.9415344
+                        -113.068072,
+                        31.9325434
                     ],
                     [
-                        -69.8804023,
-                        46.8792519
+                        -113.068072,
+                        31.8718062
                     ],
                     [
-                        -69.9421674,
-                        46.8792519
+                        -112.8161105,
+                        31.8718062
                     ],
                     [
-                        -69.9421674,
-                        46.8177399
+                        -112.8161105,
+                        31.8104171
                     ],
                     [
-                        -70.0063088,
-                        46.8177399
+                        -112.6308756,
+                        31.8104171
                     ],
                     [
-                        -70.0063088,
-                        46.6920295
+                        -112.6308756,
+                        31.7464723
                     ],
                     [
-                        -70.0704265,
-                        46.6920295
+                        -112.4418918,
+                        31.7464723
                     ],
                     [
-                        -70.0704265,
-                        46.4425926
+                        -112.4418918,
+                        31.6856001
                     ],
                     [
-                        -70.1945902,
-                        46.4425926
+                        -112.257192,
+                        31.6856001
                     ],
                     [
-                        -70.1945902,
-                        46.3785887
+                        -112.257192,
+                        31.6210352
                     ],
                     [
-                        -70.2562047,
-                        46.3785887
+                        -112.0033787,
+                        31.6210352
                     ],
                     [
-                        -70.2562047,
-                        46.3152628
+                        -112.0033787,
+                        31.559584
                     ],
                     [
-                        -70.3203651,
-                        46.3152628
+                        -111.815619,
+                        31.559584
                     ],
                     [
-                        -70.3203651,
-                        46.0651209
+                        -111.815619,
+                        31.4970238
                     ],
                     [
-                        -70.3814988,
-                        46.0651209
+                        -111.6278586,
+                        31.4970238
                     ],
                     [
-                        -70.3814988,
-                        45.93552
+                        -111.6278586,
+                        31.4339867
                     ],
                     [
-                        -70.3201618,
-                        45.93552
+                        -111.4418978,
+                        31.4339867
                     ],
                     [
-                        -70.3201618,
-                        45.879479
+                        -111.4418978,
+                        31.3733859
                     ],
                     [
-                        -70.4493131,
-                        45.879479
+                        -111.2559708,
+                        31.3733859
                     ],
                     [
-                        -70.4493131,
-                        45.7538713
+                        -111.2559708,
+                        31.3113225
                     ],
                     [
-                        -70.5070021,
-                        45.7538713
+                        -108.1845822,
+                        31.3113225
                     ],
                     [
-                        -70.5070021,
-                        45.6916912
+                        -108.1845822,
+                        31.7459502
                     ],
                     [
-                        -70.6316642,
-                        45.6916912
+                        -106.5065055,
+                        31.7459502
                     ],
                     [
-                        -70.6316642,
-                        45.6291619
+                        -106.5065055,
+                        31.6842308
                     ],
                     [
-                        -70.7575538,
-                        45.6291619
+                        -106.3797265,
+                        31.6842308
                     ],
                     [
-                        -70.7575538,
-                        45.4414685
+                        -106.3797265,
+                        31.621752
                     ],
                     [
-                        -70.8809878,
-                        45.4414685
+                        -106.317434,
+                        31.621752
                     ],
                     [
-                        -70.8809878,
-                        45.3780612
+                        -106.317434,
+                        31.4968167
                     ],
                     [
-                        -71.13328,
-                        45.3780612
+                        -106.2551769,
+                        31.4968167
                     ],
                     [
-                        -71.13328,
-                        45.3151452
+                        -106.2551769,
+                        31.4344889
                     ],
                     [
-                        -71.3830282,
-                        45.3151452
+                        -106.1924698,
+                        31.4344889
                     ],
                     [
-                        -71.3830282,
-                        45.253416
+                        -106.1924698,
+                        31.3721296
                     ],
                     [
-                        -71.5076448,
-                        45.253416
+                        -106.0039212,
+                        31.3721296
                     ],
                     [
-                        -71.5076448,
-                        45.0655726
+                        -106.0039212,
+                        31.309328
                     ],
                     [
-                        -73.9418929,
-                        45.0655726
+                        -105.9416582,
+                        31.309328
                     ],
                     [
-                        -73.9418929,
-                        45.0031242
+                        -105.9416582,
+                        31.2457547
                     ],
                     [
-                        -74.7469725,
-                        45.0031242
+                        -105.8798174,
+                        31.2457547
                     ],
                     [
-                        -74.7469725,
-                        45.0649003
+                        -105.8798174,
+                        31.1836194
                     ],
                     [
-                        -74.8800964,
-                        45.0649003
+                        -105.8162349,
+                        31.1836194
                     ],
                     [
-                        -74.8800964,
-                        45.0029023
+                        -105.8162349,
+                        31.1207155
                     ],
                     [
-                        -75.0662455,
-                        45.0029023
+                        -105.6921198,
+                        31.1207155
                     ],
                     [
-                        -75.0662455,
-                        44.9415167
+                        -105.6921198,
+                        31.0584835
                     ],
                     [
-                        -75.2539363,
-                        44.9415167
+                        -105.6302881,
+                        31.0584835
                     ],
                     [
-                        -75.2539363,
-                        44.8776043
+                        -105.6302881,
+                        30.9328271
                     ],
                     [
-                        -75.3789648,
-                        44.8776043
+                        -105.5044418,
+                        30.9328271
                     ],
                     [
-                        -75.3789648,
-                        44.8153462
+                        -105.5044418,
+                        30.8715864
                     ],
                     [
-                        -75.4431283,
-                        44.8153462
+                        -105.4412973,
+                        30.8715864
                     ],
                     [
-                        -75.4431283,
-                        44.7536053
+                        -105.4412973,
+                        30.808463
                     ],
                     [
-                        -75.5666566,
-                        44.7536053
+                        -105.3781497,
+                        30.808463
                     ],
                     [
-                        -75.5666566,
-                        44.6909879
+                        -105.3781497,
+                        30.7471828
                     ],
                     [
-                        -75.6290205,
-                        44.6909879
+                        -105.1904658,
+                        30.7471828
                     ],
                     [
-                        -75.6290205,
-                        44.6284958
+                        -105.1904658,
+                        30.6843231
                     ],
                     [
-                        -75.7540484,
-                        44.6284958
+                        -105.1286244,
+                        30.6843231
                     ],
                     [
-                        -75.7540484,
-                        44.566385
+                        -105.1286244,
+                        30.6199737
                     ],
                     [
-                        -75.817312,
-                        44.566385
+                        -105.0036504,
+                        30.6199737
                     ],
                     [
-                        -75.817312,
-                        44.5028932
+                        -105.0036504,
+                        30.5589058
                     ],
                     [
-                        -75.8799549,
-                        44.5028932
+                        -104.9417962,
+                        30.5589058
                     ],
                     [
-                        -75.8799549,
-                        44.3784946
+                        -104.9417962,
+                        30.4963236
                     ],
                     [
-                        -76.1300319,
-                        44.3784946
+                        -104.8782018,
+                        30.4963236
                     ],
                     [
-                        -76.1300319,
-                        44.3159227
+                        -104.8782018,
+                        30.3098261
                     ],
                     [
-                        -76.1926961,
-                        44.3159227
+                        -104.8155257,
+                        30.3098261
                     ],
                     [
-                        -76.1926961,
-                        44.2534378
+                        -104.8155257,
+                        30.2478305
                     ],
                     [
-                        -76.3182619,
-                        44.2534378
+                        -104.7536079,
+                        30.2478305
                     ],
                     [
-                        -76.3182619,
-                        44.1916726
+                        -104.7536079,
+                        29.9353916
                     ],
                     [
-                        -76.3792975,
-                        44.1916726
+                        -104.690949,
+                        29.9353916
                     ],
                     [
-                        -76.3792975,
-                        44.0653733
+                        -104.690949,
+                        29.8090156
                     ],
                     [
-                        -76.4427584,
-                        44.0653733
+                        -104.6291301,
+                        29.8090156
                     ],
                     [
-                        -76.4427584,
-                        43.9963825
+                        -104.6291301,
+                        29.6843577
                     ],
                     [
-                        -76.317027,
-                        43.9963825
+                        -104.5659869,
+                        29.6843577
                     ],
                     [
-                        -76.317027,
-                        43.9414581
+                        -104.5659869,
+                        29.6223459
                     ],
                     [
-                        -76.5076611,
-                        43.9414581
+                        -104.5037188,
+                        29.6223459
                     ],
                     [
-                        -76.5076611,
-                        43.8723335
+                        -104.5037188,
+                        29.5595436
                     ],
                     [
-                        -76.3829974,
-                        43.8723335
+                        -104.4410072,
+                        29.5595436
                     ],
                     [
-                        -76.3829974,
-                        43.8091872
+                        -104.4410072,
+                        29.4974832
                     ],
                     [
-                        -76.2534102,
-                        43.8091872
+                        -104.2537551,
+                        29.4974832
                     ],
                     [
-                        -76.2534102,
-                        43.5665222
+                        -104.2537551,
+                        29.3716718
                     ],
                     [
-                        -76.5064833,
-                        43.5665222
+                        -104.1291984,
+                        29.3716718
                     ],
                     [
-                        -76.5064833,
-                        43.5033881
+                        -104.1291984,
+                        29.3091621
                     ],
                     [
-                        -76.6331208,
-                        43.5033881
+                        -104.0688737,
+                        29.3091621
                     ],
                     [
-                        -76.6331208,
-                        43.4432252
+                        -104.0688737,
+                        29.2467276
                     ],
                     [
-                        -76.6951085,
-                        43.4432252
+                        -103.8187309,
+                        29.2467276
                     ],
                     [
-                        -76.6951085,
-                        43.3786858
+                        -103.8187309,
+                        29.1843076
                     ],
                     [
-                        -76.8177798,
-                        43.3786858
+                        -103.755736,
+                        29.1843076
                     ],
                     [
-                        -76.8177798,
-                        43.318066
+                        -103.755736,
+                        29.1223174
                     ],
                     [
-                        -77.682,
-                        43.318066
+                        -103.5667542,
+                        29.1223174
                     ],
                     [
-                        -77.682,
-                        43.3789376
+                        -103.5667542,
+                        29.0598119
                     ],
                     [
-                        -78.0565883,
-                        43.3789376
+                        -103.5049819,
+                        29.0598119
                     ],
                     [
-                        -78.0565883,
-                        43.4396918
+                        -103.5049819,
+                        28.9967506
                     ],
                     [
-                        -78.4389748,
-                        43.4396918
+                        -103.3165753,
+                        28.9967506
                     ],
                     [
-                        -78.4389748,
-                        43.3794382
+                        -103.3165753,
+                        28.9346923
                     ],
                     [
-                        -78.8803396,
-                        43.3794382
+                        -103.0597572,
+                        28.9346923
                     ],
                     [
-                        -78.8803396,
-                        43.3149724
+                        -103.0597572,
+                        29.0592965
                     ],
                     [
-                        -79.1298858,
-                        43.3149724
+                        -102.9979694,
+                        29.0592965
                     ],
                     [
-                        -79.1298858,
-                        43.2429286
+                        -102.9979694,
+                        29.1212855
                     ],
                     [
-                        -79.0669615,
-                        43.2429286
+                        -102.9331397,
+                        29.1212855
                     ],
                     [
-                        -79.0669615,
-                        43.1299931
+                        -102.9331397,
+                        29.1848575
                     ],
                     [
-                        -79.1298858,
-                        43.1299931
+                        -102.8095989,
+                        29.1848575
                     ],
                     [
-                        -79.1298858,
-                        43.0577305
+                        -102.8095989,
+                        29.2526154
                     ],
                     [
-                        -79.071264,
-                        43.0577305
+                        -102.8701345,
+                        29.2526154
                     ],
                     [
-                        -79.071264,
-                        42.9294906
+                        -102.8701345,
+                        29.308096
                     ],
                     [
-                        -78.943264,
-                        42.9294906
+                        -102.8096681,
+                        29.308096
                     ],
                     [
-                        -78.943264,
-                        42.7542165
+                        -102.8096681,
+                        29.3715484
                     ],
                     [
-                        -79.069439,
-                        42.7542165
+                        -102.7475655,
+                        29.3715484
                     ],
                     [
-                        -79.069439,
-                        42.6941622
+                        -102.7475655,
+                        29.5581899
                     ],
                     [
-                        -79.133439,
-                        42.6941622
+                        -102.684554,
+                        29.5581899
                     ],
                     [
-                        -79.133439,
-                        42.6296973
+                        -102.684554,
+                        29.6847655
                     ],
                     [
-                        -79.1947499,
-                        42.6296973
+                        -102.4967764,
+                        29.6847655
                     ],
                     [
-                        -79.1947499,
-                        42.5663538
+                        -102.4967764,
+                        29.7457694
                     ],
                     [
-                        -79.3786827,
-                        42.5663538
+                        -102.3086647,
+                        29.7457694
                     ],
                     [
-                        -79.3786827,
-                        42.5033425
+                        -102.3086647,
+                        29.8086627
                     ],
                     [
-                        -79.4442961,
-                        42.5033425
+                        -102.1909323,
+                        29.8086627
                     ],
                     [
-                        -79.4442961,
-                        42.4410614
+                        -102.1909323,
+                        29.7460097
                     ],
                     [
-                        -79.5679936,
-                        42.4410614
+                        -101.5049914,
+                        29.7460097
                     ],
                     [
-                        -79.5679936,
-                        42.3775264
+                        -101.5049914,
+                        29.6846777
                     ],
                     [
-                        -79.6906154,
-                        42.3775264
+                        -101.3805796,
+                        29.6846777
                     ],
                     [
-                        -79.6906154,
-                        42.3171086
+                        -101.3805796,
+                        29.5594459
                     ],
                     [
-                        -79.8164642,
-                        42.3171086
+                        -101.3175057,
+                        29.5594459
                     ],
                     [
-                        -79.8164642,
-                        42.2534481
+                        -101.3175057,
+                        29.4958934
                     ],
                     [
-                        -80.0052373,
-                        42.2534481
+                        -101.1910075,
+                        29.4958934
                     ],
                     [
-                        -80.0052373,
-                        42.1909188
+                        -101.1910075,
+                        29.4326115
                     ],
                     [
-                        -80.1916829,
-                        42.1909188
+                        -101.067501,
+                        29.4326115
                     ],
                     [
-                        -80.1916829,
-                        42.1272555
+                        -101.067501,
+                        29.308808
                     ],
                     [
-                        -80.3167992,
-                        42.1272555
+                        -100.9418897,
+                        29.308808
                     ],
                     [
-                        -80.3167992,
-                        42.0669857
+                        -100.9418897,
+                        29.2456231
                     ],
                     [
-                        -80.5063234,
-                        42.0669857
+                        -100.8167271,
+                        29.2456231
                     ],
                     [
-                        -80.5063234,
-                        42.0034331
+                        -100.8167271,
+                        29.1190449
                     ],
                     [
-                        -80.6930471,
-                        42.0034331
+                        -100.7522672,
+                        29.1190449
                     ],
                     [
-                        -80.6930471,
-                        41.9415141
+                        -100.7522672,
+                        29.0578214
                     ],
                     [
-                        -80.9440403,
-                        41.9415141
+                        -100.6925358,
+                        29.0578214
                     ],
                     [
-                        -80.9440403,
-                        41.8781193
+                        -100.6925358,
+                        28.8720431
                     ],
                     [
-                        -81.1942729,
-                        41.8781193
+                        -100.6290158,
+                        28.8720431
                     ],
                     [
-                        -81.1942729,
-                        41.8166455
+                        -100.6290158,
+                        28.8095363
                     ],
                     [
-                        -81.3190089,
-                        41.8166455
+                        -100.5679901,
+                        28.8095363
                     ],
                     [
-                        -81.3190089,
-                        41.7545453
+                        -100.5679901,
+                        28.622554
                     ],
                     [
-                        -81.4418435,
-                        41.7545453
+                        -100.5040411,
+                        28.622554
                     ],
                     [
-                        -81.4418435,
-                        41.690965
+                        -100.5040411,
+                        28.5583804
                     ],
                     [
-                        -81.5053523,
-                        41.690965
+                        -100.4421832,
+                        28.5583804
                     ],
                     [
-                        -81.5053523,
-                        41.6301643
+                        -100.4421832,
+                        28.4968266
                     ],
                     [
-                        -82.7470081,
-                        41.6301643
+                        -100.379434,
+                        28.4968266
                     ],
                     [
-                        -82.7470081,
-                        41.7536942
+                        -100.379434,
+                        28.3092865
                     ],
                     [
-                        -82.8839135,
-                        41.7536942
+                        -100.3171942,
+                        28.3092865
                     ],
                     [
-                        -82.8839135,
-                        41.5656075
+                        -100.3171942,
+                        28.1835681
                     ],
                     [
-                        -82.9957195,
-                        41.5656075
+                        -100.254483,
+                        28.1835681
                     ],
                     [
-                        -82.9957195,
-                        41.6270375
+                        -100.254483,
+                        28.1213885
                     ],
                     [
-                        -83.1257796,
-                        41.6270375
+                        -100.1282282,
+                        28.1213885
                     ],
                     [
-                        -83.1257796,
-                        41.6878411
+                        -100.1282282,
+                        28.059215
                     ],
                     [
-                        -83.2474733,
-                        41.6878411
+                        -100.0659537,
+                        28.059215
                     ],
                     [
-                        -83.2474733,
-                        41.7536942
+                        -100.0659537,
+                        27.9966087
                     ],
                     [
-                        -83.3737305,
-                        41.7536942
+                        -100.0023855,
+                        27.9966087
                     ],
                     [
-                        -83.3737305,
-                        41.809276
+                        -100.0023855,
+                        27.9332152
                     ],
                     [
-                        -83.3106019,
-                        41.809276
+                        -99.9426497,
+                        27.9332152
                     ],
                     [
-                        -83.3106019,
-                        41.8716064
+                        -99.9426497,
+                        27.7454658
                     ],
                     [
-                        -83.2474733,
-                        41.8716064
+                        -99.816851,
+                        27.7454658
                     ],
                     [
-                        -83.2474733,
-                        41.9361393
+                        -99.816851,
+                        27.6834301
                     ],
                     [
-                        -83.1843447,
-                        41.9361393
+                        -99.7541346,
+                        27.6834301
                     ],
                     [
-                        -83.1843447,
-                        41.9960851
+                        -99.7541346,
+                        27.6221543
                     ],
                     [
-                        -83.1207681,
-                        41.9960851
+                        -99.6291629,
+                        27.6221543
                     ],
                     [
-                        -83.1207681,
-                        42.2464812
+                        -99.6291629,
+                        27.5588977
                     ],
                     [
-                        -83.0589194,
-                        42.2464812
+                        -99.5672838,
+                        27.5588977
                     ],
                     [
-                        -83.0589194,
-                        42.3089555
+                        -99.5672838,
+                        27.4353752
                     ],
                     [
-                        -82.8685328,
-                        42.3089555
+                        -99.5041798,
+                        27.4353752
                     ],
                     [
-                        -82.8685328,
-                        42.3717652
+                        -99.5041798,
+                        27.3774021
                     ],
                     [
-                        -82.8072219,
-                        42.3717652
+                        -99.5671796,
+                        27.3774021
                     ],
                     [
-                        -82.8072219,
-                        42.558553
+                        -99.5671796,
+                        27.2463726
                     ],
                     [
-                        -82.7553745,
-                        42.558553
+                        -99.504975,
+                        27.2463726
                     ],
                     [
-                        -82.7553745,
-                        42.4954945
+                        -99.504975,
+                        26.9965649
                     ],
                     [
-                        -82.5599041,
-                        42.4954945
+                        -99.4427427,
+                        26.9965649
                     ],
                     [
-                        -82.5599041,
-                        42.558553
+                        -99.4427427,
+                        26.872803
                     ],
                     [
-                        -82.4967755,
-                        42.558553
+                        -99.3800633,
+                        26.872803
                     ],
                     [
-                        -82.4967755,
-                        42.6833607
+                        -99.3800633,
+                        26.8068179
                     ],
                     [
-                        -82.4328863,
-                        42.6833607
+                        -99.3190684,
+                        26.8068179
                     ],
                     [
-                        -82.4328863,
-                        42.9342196
+                        -99.3190684,
+                        26.7473614
                     ],
                     [
-                        -82.3700552,
-                        42.9342196
+                        -99.2537541,
+                        26.7473614
                     ],
                     [
-                        -82.3700552,
-                        43.0648071
+                        -99.2537541,
+                        26.6210068
                     ],
                     [
-                        -82.4328863,
-                        43.0648071
+                        -99.1910617,
+                        26.6210068
                     ],
                     [
-                        -82.4328863,
-                        43.1917566
+                        -99.1910617,
+                        26.4956737
                     ],
                     [
-                        -82.4947464,
-                        43.1917566
+                        -99.1300639,
+                        26.4956737
                     ],
                     [
-                        -82.4947464,
-                        43.5034627
+                        -99.1300639,
+                        26.3713808
                     ],
                     [
-                        -82.557133,
-                        43.5034627
+                        -99.0029473,
+                        26.3713808
                     ],
                     [
-                        -82.557133,
-                        43.8160901
+                        -99.0029473,
+                        26.3093836
                     ],
                     [
-                        -82.6197884,
-                        43.8160901
+                        -98.816572,
+                        26.3093836
                     ],
                     [
-                        -82.6197884,
-                        43.9422098
+                        -98.816572,
+                        26.2457762
                     ],
                     [
-                        -82.6839499,
-                        43.9422098
+                        -98.6920082,
+                        26.2457762
                     ],
                     [
-                        -82.6839499,
-                        44.0022641
+                        -98.6920082,
+                        26.1837096
                     ],
                     [
-                        -82.7465346,
-                        44.0022641
+                        -98.4440896,
+                        26.1837096
                     ],
                     [
-                        -82.7465346,
-                        44.0670545
+                        -98.4440896,
+                        26.1217217
                     ],
                     [
-                        -82.8708696,
-                        44.0670545
+                        -98.3823181,
+                        26.1217217
                     ],
                     [
-                        -82.8708696,
-                        44.1291935
+                        -98.3823181,
+                        26.0596488
                     ],
                     [
-                        -83.008517,
-                        44.1291935
+                        -98.2532707,
+                        26.0596488
                     ],
                     [
-                        -83.008517,
-                        44.0664786
+                        -98.2532707,
+                        25.9986871
                     ],
                     [
-                        -83.1336086,
-                        44.0664786
+                        -98.0109084,
+                        25.9986871
                     ],
                     [
-                        -83.1336086,
-                        44.0053949
+                        -98.0109084,
+                        25.9932255
                     ],
                     [
-                        -83.2414522,
-                        44.0053949
+                        -97.6932319,
+                        25.9932255
                     ],
                     [
-                        -83.2414522,
-                        44.9962034
+                        -97.6932319,
+                        25.9334103
                     ],
                     [
-                        -83.1806112,
-                        44.9962034
+                        -97.6313904,
+                        25.9334103
                     ],
                     [
-                        -83.1806112,
-                        45.067302
+                        -97.6313904,
+                        25.8695893
                     ],
                     [
-                        -83.2455172,
-                        45.067302
+                        -97.5046779,
+                        25.8695893
                     ],
                     [
-                        -83.2455172,
-                        45.1287382
+                        -97.5046779,
+                        25.8073488
                     ],
                     [
-                        -83.3065878,
-                        45.1287382
+                        -97.3083401,
+                        25.8073488
                     ],
                     [
-                        -83.3065878,
-                        45.2551509
+                        -97.3083401,
+                        25.8731159
                     ],
                     [
-                        -83.3706087,
-                        45.2551509
+                        -97.2456326,
+                        25.8731159
                     ],
                     [
-                        -83.3706087,
-                        45.3165923
+                        -97.2456326,
+                        25.9353731
                     ],
                     [
-                        -83.4325644,
-                        45.3165923
+                        -97.1138939,
+                        25.9353731
                     ],
                     [
-                        -83.4325644,
-                        45.3792105
+                        -97.1138939,
+                        27.6809179
                     ],
                     [
-                        -83.6178415,
-                        45.3792105
+                        -97.0571035,
+                        27.6809179
                     ],
                     [
-                        -83.6178415,
-                        45.4419665
+                        -97.0571035,
+                        27.8108242
                     ],
                     [
-                        -83.8084291,
-                        45.4419665
+                        -95.5810766,
+                        27.8108242
                     ],
                     [
-                        -83.8084291,
-                        45.5036189
+                        -95.5810766,
+                        28.7468827
                     ],
                     [
-                        -84.0550718,
-                        45.5036189
+                        -94.271041,
+                        28.7468827
                     ],
                     [
-                        -84.0550718,
-                        45.5647907
+                        -94.271041,
+                        29.5594076
                     ],
                     [
-                        -84.1235181,
-                        45.5647907
+                        -92.5029947,
+                        29.5594076
                     ],
                     [
-                        -84.1235181,
-                        45.6287845
+                        -92.5029947,
+                        29.4974754
                     ],
                     [
-                        -84.1807534,
-                        45.6287845
+                        -91.8776216,
+                        29.4974754
                     ],
                     [
-                        -84.1807534,
-                        45.6914688
+                        -91.8776216,
+                        29.3727013
                     ],
                     [
-                        -84.3111554,
-                        45.6914688
+                        -91.378418,
+                        29.3727013
                     ],
                     [
-                        -84.3111554,
-                        45.9337076
+                        -91.378418,
+                        29.2468326
                     ],
                     [
-                        -83.8209974,
-                        45.9337076
+                        -91.3153953,
+                        29.2468326
                     ],
                     [
-                        -83.8209974,
-                        45.8725113
+                        -91.3153953,
+                        29.1844301
                     ],
                     [
-                        -83.4968086,
-                        45.8725113
+                        -91.1294702,
+                        29.1844301
                     ],
                     [
-                        -83.4968086,
-                        45.9337076
+                        -91.1294702,
+                        29.1232559
                     ],
                     [
-                        -83.4338066,
-                        45.9337076
+                        -91.0052632,
+                        29.1232559
                     ],
                     [
-                        -83.4338066,
-                        46.0016863
+                        -91.0052632,
+                        28.9968437
                     ],
                     [
-                        -83.4962697,
-                        46.0016863
+                        -89.4500159,
+                        28.9968437
                     ],
                     [
-                        -83.4962697,
-                        46.0668178
+                        -89.4500159,
+                        28.8677422
                     ],
                     [
-                        -83.5599956,
-                        46.0668178
+                        -88.8104309,
+                        28.8677422
                     ],
                     [
-                        -83.5599956,
-                        46.1261576
+                        -88.8104309,
+                        30.1841864
                     ],
                     [
-                        -83.9954558,
-                        46.1261576
+                        -85.8791527,
+                        30.1841864
                     ],
                     [
-                        -83.9954558,
-                        46.1931747
+                        -85.8791527,
+                        29.5455038
                     ],
                     [
-                        -84.0591816,
-                        46.1931747
+                        -84.8368083,
+                        29.5455038
                     ],
                     [
-                        -84.0591816,
-                        46.3814972
+                        -84.8368083,
+                        29.6225158
                     ],
                     [
-                        -84.1152614,
-                        46.3814972
+                        -84.7482786,
+                        29.6225158
                     ],
                     [
-                        -84.1152614,
-                        46.4953584
+                        -84.7482786,
+                        29.683624
                     ],
                     [
-                        -84.0591816,
-                        46.4953584
+                        -84.685894,
+                        29.683624
                     ],
                     [
-                        -84.0591816,
-                        46.5682653
+                        -84.685894,
+                        29.7468386
                     ],
                     [
-                        -84.2579545,
-                        46.5682653
+                        -83.6296975,
+                        29.7468386
                     ],
                     [
-                        -84.2579545,
-                        46.5051232
+                        -83.6296975,
+                        29.4324361
                     ],
                     [
-                        -84.3071879,
-                        46.5051232
+                        -83.3174937,
+                        29.4324361
                     ],
                     [
-                        -84.3071879,
-                        46.5682653
+                        -83.3174937,
+                        29.0579442
                     ],
                     [
-                        -84.4415364,
-                        46.5682653
+                        -82.879659,
+                        29.0579442
                     ],
                     [
-                        -84.4415364,
-                        46.504525
+                        -82.879659,
+                        27.7453529
                     ],
                     [
-                        -84.9965729,
-                        46.504525
+                        -82.8182822,
+                        27.7453529
                     ],
                     [
-                        -84.9965729,
-                        46.6842882
+                        -82.8182822,
+                        26.9290868
                     ],
                     [
-                        -84.9298158,
-                        46.6842882
+                        -82.3796782,
+                        26.9290868
                     ],
                     [
-                        -84.9298158,
-                        46.818077
+                        -82.3796782,
+                        26.3694183
                     ],
                     [
-                        -85.3165894,
-                        46.818077
+                        -81.8777106,
+                        26.3694183
                     ],
                     [
-                        -85.3165894,
-                        46.7535825
+                        -81.8777106,
+                        25.805971
                     ],
                     [
-                        -87.5562645,
-                        46.7535825
+                        -81.5036862,
+                        25.805971
                     ],
                     [
-                        -87.5562645,
-                        47.4407371
+                        -81.5036862,
+                        25.7474753
                     ],
                     [
-                        -87.6825361,
-                        47.4407371
+                        -81.4405462,
+                        25.7474753
                     ],
                     [
-                        -87.6825361,
-                        47.5035554
+                        -81.4405462,
+                        25.6851489
                     ],
                     [
-                        -88.2560738,
-                        47.5035554
+                        -81.3155883,
+                        25.6851489
                     ],
                     [
-                        -88.2560738,
-                        47.4433716
+                        -81.3155883,
+                        25.5600985
                     ],
                     [
-                        -88.4417419,
-                        47.4433716
+                        -81.2538534,
+                        25.5600985
                     ],
                     [
-                        -88.4417419,
-                        47.3789949
+                        -81.2538534,
+                        25.4342361
                     ],
                     [
-                        -88.50683,
-                        47.3789949
+                        -81.1902012,
+                        25.4342361
                     ],
                     [
-                        -88.50683,
-                        47.3153881
+                        -81.1902012,
+                        25.1234341
                     ],
                     [
-                        -88.6312821,
-                        47.3153881
+                        -81.1288133,
+                        25.1234341
                     ],
                     [
-                        -88.6312821,
-                        47.2539782
+                        -81.1288133,
+                        25.0619389
                     ],
                     [
-                        -88.7569636,
-                        47.2539782
+                        -81.0649231,
+                        25.0619389
                     ],
                     [
-                        -88.7569636,
-                        47.1934682
+                        -81.0649231,
+                        24.8157807
                     ],
                     [
-                        -88.8838253,
-                        47.1934682
+                        -81.6289469,
+                        24.8157807
                     ],
                     [
-                        -88.8838253,
-                        47.1284735
+                        -81.6289469,
+                        24.7538367
                     ],
                     [
-                        -88.9434208,
-                        47.1284735
+                        -81.6907173,
+                        24.7538367
                     ],
                     [
-                        -88.9434208,
-                        47.0662127
+                        -81.6907173,
+                        24.6899374
                     ],
                     [
-                        -89.0708726,
-                        47.0662127
+                        -81.8173189,
+                        24.6899374
                     ],
                     [
-                        -89.0708726,
-                        47.0026826
+                        -81.8173189,
+                        24.6279161
                     ],
                     [
-                        -89.2565553,
-                        47.0026826
+                        -82.1910041,
+                        24.6279161
                     ],
                     [
-                        -89.2565553,
-                        46.9410806
+                        -82.1910041,
+                        24.496294
                     ],
                     [
-                        -90.3677669,
-                        46.9410806
+                        -81.6216596,
+                        24.496294
                     ],
                     [
-                        -90.3677669,
-                        47.6844827
+                        -81.6216596,
+                        24.559484
                     ],
                     [
-                        -90.3069978,
-                        47.6844827
+                        -81.372006,
+                        24.559484
                     ],
                     [
-                        -90.3069978,
-                        47.7460174
+                        -81.372006,
+                        24.6220687
                     ],
                     [
-                        -89.994859,
-                        47.7460174
+                        -81.0593278,
+                        24.6220687
                     ],
                     [
-                        -89.994859,
-                        47.8082719
+                        -81.0593278,
+                        24.684826
                     ],
                     [
-                        -89.8048615,
-                        47.8082719
+                        -80.9347147,
+                        24.684826
                     ],
                     [
-                        -89.8048615,
-                        47.8700562
+                        -80.9347147,
+                        24.7474828
                     ],
                     [
-                        -89.6797699,
-                        47.8700562
+                        -80.7471081,
+                        24.7474828
                     ],
                     [
-                        -89.6797699,
-                        47.9339637
+                        -80.7471081,
+                        24.8100618
                     ],
                     [
-                        -89.4933757,
-                        47.9339637
+                        -80.3629898,
+                        24.8100618
                     ],
                     [
-                        -89.4933757,
-                        47.9957956
+                        -80.3629898,
+                        25.1175858
                     ],
                     [
-                        -89.4284697,
-                        47.9957956
+                        -80.122344,
+                        25.1175858
                     ],
                     [
-                        -89.4284697,
-                        48.0656377
+                        -80.122344,
+                        25.7472357
                     ],
                     [
-                        -89.9932739,
-                        48.0656377
+                        -80.0588458,
+                        25.7472357
                     ],
                     [
-                        -89.9932739,
-                        48.1282966
+                        -80.0588458,
+                        26.3708251
                     ],
                     [
-                        -90.7455933,
-                        48.1282966
+                        -79.995837,
+                        26.3708251
                     ],
                     [
-                        -90.7455933,
-                        48.1893056
+                        -79.995837,
+                        26.9398003
                     ],
                     [
-                        -90.8087291,
-                        48.1893056
+                        -80.0587265,
+                        26.9398003
                     ],
                     [
-                        -90.8087291,
-                        48.2522065
+                        -80.0587265,
+                        27.1277466
                     ],
                     [
-                        -91.067763,
-                        48.2522065
+                        -80.1226251,
+                        27.1277466
                     ],
                     [
-                        -91.067763,
-                        48.1916658
+                        -80.1226251,
+                        27.2534279
                     ],
                     [
-                        -91.1946247,
-                        48.1916658
+                        -80.1846956,
+                        27.2534279
                     ],
                     [
-                        -91.1946247,
-                        48.1279027
+                        -80.1846956,
+                        27.3781229
                     ],
                     [
-                        -91.6814196,
-                        48.1279027
+                        -80.246175,
+                        27.3781229
                     ],
                     [
-                        -91.6814196,
-                        48.2525994
+                        -80.246175,
+                        27.5658729
                     ],
                     [
-                        -91.9321927,
-                        48.2525994
+                        -80.3094768,
+                        27.5658729
                     ],
                     [
-                        -91.9321927,
-                        48.3142454
+                        -80.3094768,
+                        27.7530311
                     ],
                     [
-                        -91.9929683,
-                        48.3142454
+                        -80.3721485,
+                        27.7530311
                     ],
                     [
-                        -91.9929683,
-                        48.3780845
+                        -80.3721485,
+                        27.8774451
                     ],
                     [
-                        -92.3189383,
-                        48.3780845
+                        -80.4351457,
+                        27.8774451
                     ],
                     [
-                        -92.3189383,
-                        48.2529081
+                        -80.4351457,
+                        28.0033366
                     ],
                     [
-                        -92.3732233,
-                        48.2529081
+                        -80.4966078,
+                        28.0033366
                     ],
                     [
-                        -92.3732233,
-                        48.3153385
+                        -80.4966078,
+                        28.1277326
                     ],
                     [
-                        -92.4322288,
-                        48.3153385
+                        -80.5587159,
+                        28.1277326
                     ],
                     [
-                        -92.4322288,
-                        48.4411448
+                        -80.5587159,
+                        28.3723509
                     ],
                     [
-                        -92.4977248,
-                        48.4411448
+                        -80.4966335,
+                        28.3723509
                     ],
                     [
-                        -92.4977248,
-                        48.501781
+                        -80.4966335,
+                        29.5160326
                     ],
                     [
-                        -92.5679413,
-                        48.501781
+                        -81.1213644,
+                        29.5160326
                     ],
                     [
-                        -92.5679413,
-                        48.439579
+                        -81.1213644,
+                        31.6846966
                     ],
                     [
-                        -92.6210462,
-                        48.439579
+                        -80.6018723,
+                        31.6846966
                     ],
                     [
-                        -92.6210462,
-                        48.5650783
+                        -80.6018723,
+                        32.2475309
                     ],
                     [
-                        -92.8086835,
-                        48.5650783
+                        -79.4921024,
+                        32.2475309
                     ],
                     [
-                        -92.8086835,
-                        48.6286865
+                        -79.4921024,
+                        32.9970261
                     ],
                     [
-                        -92.8086835,
-                        48.6267365
+                        -79.1116488,
+                        32.9970261
                     ],
                     [
-                        -92.933185,
-                        48.6267365
+                        -79.1116488,
+                        33.3729457
                     ],
                     [
-                        -92.933185,
-                        48.6922145
+                        -78.6153621,
+                        33.3729457
                     ],
                     [
-                        -93.0051716,
-                        48.6922145
+                        -78.6153621,
+                        33.8097638
                     ],
                     [
-                        -93.0051716,
-                        48.6282965
+                        -77.9316963,
+                        33.8097638
                     ],
                     [
-                        -93.1225924,
-                        48.6282965
+                        -77.9316963,
+                        33.8718243
                     ],
                     [
-                        -93.1225924,
-                        48.6922145
+                        -77.8692252,
+                        33.8718243
                     ],
                     [
-                        -93.3190806,
-                        48.6922145
+                        -77.8692252,
+                        34.0552454
                     ],
                     [
-                        -93.3190806,
-                        48.6267365
+                        -77.6826392,
+                        34.0552454
                     ],
                     [
-                        -93.5049477,
-                        48.6267365
+                        -77.6826392,
+                        34.2974598
                     ],
                     [
-                        -93.5049477,
-                        48.5635164
+                        -77.2453509,
+                        34.2974598
                     ],
                     [
-                        -93.7474601,
-                        48.5635164
+                        -77.2453509,
+                        34.5598585
                     ],
                     [
-                        -93.7474601,
-                        48.6267365
+                        -76.4973277,
+                        34.5598585
                     ],
                     [
-                        -93.8135461,
-                        48.6267365
+                        -76.4973277,
+                        34.622796
                     ],
                     [
-                        -93.8135461,
-                        48.6898775
+                        -76.4337602,
+                        34.622796
                     ],
                     [
-                        -94.2453121,
-                        48.6898775
+                        -76.4337602,
+                        34.6849285
                     ],
                     [
-                        -94.2453121,
-                        48.7554327
+                        -76.373212,
+                        34.6849285
                     ],
                     [
-                        -94.6183171,
-                        48.7554327
+                        -76.373212,
+                        34.7467674
                     ],
                     [
-                        -94.6183171,
-                        48.941036
+                        -76.3059364,
+                        34.7467674
                     ],
                     [
-                        -94.6809018,
-                        48.941036
+                        -76.3059364,
+                        34.808551
                     ],
                     [
-                        -94.6809018,
-                        49.0029737
+                        -76.2468017,
+                        34.808551
                     ],
                     [
-                        -94.7441532,
-                        49.0029737
+                        -76.2468017,
+                        34.8728418
                     ],
                     [
-                        -94.7441532,
-                        49.2536079
+                        -76.1825922,
+                        34.8728418
                     ],
                     [
-                        -94.8084069,
-                        49.2536079
+                        -76.1825922,
+                        34.9335332
                     ],
                     [
-                        -94.8084069,
-                        49.3784134
+                        -76.120814,
+                        34.9335332
                     ],
                     [
-                        -95.1192391,
-                        49.3784134
+                        -76.120814,
+                        34.9952359
                     ],
                     [
-                        -95.1192391,
-                        49.4425264
+                        -75.9979015,
+                        34.9952359
                     ],
                     [
-                        -95.1934341,
-                        49.4425264
+                        -75.9979015,
+                        35.0578182
                     ],
                     [
-                        -95.1934341,
-                        49.0035292
+                        -75.870338,
+                        35.0578182
                     ],
                     [
-                        -96.87069,
-                        49.0035292
+                        -75.870338,
+                        35.1219097
                     ],
                     [
-                        -96.87069,
-                        49.0656063
+                        -75.7462194,
+                        35.1219097
                     ],
                     [
-                        -99.0049312,
-                        49.0656063
+                        -75.7462194,
+                        35.1818911
                     ],
                     [
-                        -99.0049312,
-                        49.0050714
+                        -75.4929694,
+                        35.1818911
                     ],
                     [
-                        -109.3699257,
-                        49.0050714
+                        -75.4929694,
+                        35.3082988
                     ],
                     [
-                        -109.3699257,
-                        49.0668231
+                        -75.4325662,
+                        35.3082988
                     ],
                     [
-                        -109.5058746,
-                        49.0668231
+                        -75.4325662,
+                        35.7542495
                     ],
                     [
-                        -109.5058746,
-                        49.0050714
+                        -75.4969907,
+                        35.7542495
                     ],
                     [
-                        -114.1830014,
-                        49.0050714
+                        -75.4969907,
+                        37.8105602
                     ],
                     [
-                        -114.1830014,
-                        49.0687317
+                        -75.3082972,
+                        37.8105602
                     ],
                     [
-                        -114.7578709,
-                        49.0687317
+                        -75.3082972,
+                        37.8720088
                     ],
                     [
-                        -114.7578709,
-                        49.0050714
+                        -75.245601,
+                        37.8720088
                     ],
                     [
-                        -115.433731,
-                        49.0050714
+                        -75.245601,
+                        37.9954849
                     ],
                     [
-                        -115.433731,
-                        49.0671412
+                        -75.1828751,
+                        37.9954849
                     ],
                     [
-                        -116.5062706,
-                        49.0671412
+                        -75.1828751,
+                        38.0585079
                     ],
                     [
-                        -116.5062706,
-                        49.0050714
+                        -75.1184793,
+                        38.0585079
                     ],
                     [
-                        -117.3089504,
-                        49.0050714
+                        -75.1184793,
+                        38.2469091
                     ],
                     [
-                        -117.3089504,
-                        49.0659803
+                        -75.0592098,
+                        38.2469091
                     ],
                     [
-                        -119.882945,
-                        49.0659803
+                        -75.0592098,
+                        38.3704316
                     ],
                     [
-                        -119.882945,
-                        49.0050714
+                        -74.9948111,
+                        38.3704316
                     ],
                     [
-                        -120.1208555,
-                        49.0050714
+                        -74.9948111,
+                        38.8718417
                     ],
                     [
-                        -120.1208555,
-                        49.0678367
+                        -74.4878252,
+                        38.8718417
                     ],
                     [
-                        -121.4451636,
-                        49.0678367
+                        -74.4878252,
+                        39.3089428
                     ],
                     [
-                        -121.4451636,
-                        49.0050714
+                        -74.1766317,
+                        39.3089428
                     ],
                     [
-                        -121.9311808,
-                        49.0050714
+                        -74.1766317,
+                        39.6224653
                     ],
                     [
-                        -121.9311808,
-                        49.0656099
+                        -74.0567045,
+                        39.6224653
                     ],
                     [
-                        -122.817484,
-                        49.0656099
+                        -74.0567045,
+                        39.933178
                     ],
                     [
-                        -122.817484,
-                        49.0029143
+                        -73.9959035,
+                        39.933178
                     ],
                     [
-                        -122.8795155,
-                        49.0029143
+                        -73.9959035,
+                        40.1854852
                     ],
                     [
-                        -122.8795155,
-                        48.9347018
+                        -73.9341593,
+                        40.1854852
                     ],
                     [
-                        -122.8174629,
-                        48.9347018
+                        -73.9341593,
+                        40.4959486
                     ],
                     [
-                        -122.8174629,
-                        48.8101998
+                        -73.8723024,
+                        40.4959486
                     ],
                     [
-                        -122.7538859,
-                        48.8101998
+                        -73.8723024,
+                        40.5527135
                     ],
                     [
-                        -122.7538859,
-                        48.7533758
+                        -71.8074506,
+                        40.5527135
                     ],
                     [
-                        -122.8712937,
-                        48.7533758
+                        -71.8074506,
+                        41.3088005
                     ],
                     [
-                        -122.8712937,
-                        48.8153948
+                        -70.882512,
+                        41.3088005
                     ],
                     [
-                        -123.0055391,
-                        48.8153948
+                        -70.882512,
+                        41.184978
                     ],
                     [
-                        -123.0055391,
-                        48.7529529
+                        -70.7461947,
+                        41.184978
                     ],
                     [
-                        -123.1296926,
-                        48.7529529
+                        -70.7461947,
+                        41.3091865
                     ],
                     [
-                        -123.1296926,
-                        48.6902201
+                        -70.4337553,
+                        41.3091865
                     ],
                     [
-                        -123.1838197,
-                        48.6902201
+                        -70.4337553,
+                        41.4963885
                     ],
                     [
-                        -123.1838197,
-                        48.7529029
-                    ]
-                ],
-                [
-                    [
-                        -122.9341743,
-                        37.7521547
+                        -69.9334281,
+                        41.4963885
                     ],
                     [
-                        -122.9347457,
-                        37.6842013
+                        -69.9334281,
+                        41.6230802
                     ],
                     [
-                        -123.0679013,
-                        37.6849023
+                        -69.869857,
+                        41.6230802
                     ],
                     [
-                        -123.0673747,
-                        37.7475251
+                        -69.869857,
+                        41.8776895
                     ],
                     [
-                        -123.1292603,
-                        37.7478506
+                        -69.935791,
+                        41.8776895
                     ],
                     [
-                        -123.1286894,
-                        37.815685
+                        -69.935791,
+                        42.0032342
                     ],
                     [
-                        -123.0590687,
-                        37.8153192
+                        -69.9975823,
+                        42.0032342
                     ],
                     [
-                        -123.0595947,
-                        37.7528143
-                    ]
-                ],
-                [
-                    [
-                        -71.6299464,
-                        41.2540893
+                        -69.9975823,
+                        42.0650191
                     ],
                     [
-                        -71.4966465,
-                        41.2541393
+                        -70.0606103,
+                        42.0650191
                     ],
                     [
-                        -71.4965596,
-                        41.122965
+                        -70.0606103,
+                        42.1294348
                     ],
                     [
-                        -71.6298594,
-                        41.1229149
-                    ]
-                ],
-                [
-                    [
-                        -70.3184265,
-                        41.3775196
+                        -70.5572884,
+                        42.1294348
                     ],
                     [
-                        -70.3183384,
-                        41.2448243
+                        -70.5572884,
+                        43.2487079
                     ],
                     [
-                        -70.1906612,
-                        41.2448722
+                        -70.4974097,
+                        43.2487079
                     ],
                     [
-                        -70.1906239,
-                        41.1886019
+                        -70.4974097,
+                        43.3092194
                     ],
                     [
-                        -69.9336025,
-                        41.1886984
+                        -70.3704249,
+                        43.3092194
                     ],
                     [
-                        -69.933729,
-                        41.3791941
+                        -70.3704249,
+                        43.371963
                     ],
                     [
-                        -69.9950664,
-                        41.3791712
+                        -70.3085701,
+                        43.371963
                     ],
                     [
-                        -69.995109,
-                        41.443159
+                        -70.3085701,
+                        43.4969879
                     ],
                     [
-                        -70.0707828,
-                        41.4431307
+                        -70.183921,
+                        43.4969879
                     ],
                     [
-                        -70.0706972,
-                        41.3144915
+                        -70.183921,
+                        43.6223531
                     ],
                     [
-                        -70.2461667,
-                        41.3144258
+                        -70.057583,
+                        43.6223531
                     ],
                     [
-                        -70.2462087,
-                        41.3775467
-                    ]
-                ],
-                [
-                    [
-                        -68.9403374,
-                        43.9404062
+                        -70.057583,
+                        43.6850173
                     ],
                     [
-                        -68.6856948,
-                        43.9404977
+                        -69.7455247,
+                        43.6850173
                     ],
                     [
-                        -68.6856475,
-                        43.8721797
+                        -69.7455247,
+                        43.7476571
                     ],
                     [
-                        -68.7465405,
-                        43.8721577
+                        -69.2472845,
+                        43.7476571
                     ],
                     [
-                        -68.7464976,
-                        43.8102529
+                        -69.2472845,
+                        43.8107035
                     ],
                     [
-                        -68.8090782,
-                        43.8102304
+                        -69.0560701,
+                        43.8107035
                     ],
                     [
-                        -68.8090343,
-                        43.746728
+                        -69.0560701,
+                        43.8717247
                     ],
                     [
-                        -68.8773094,
-                        43.7467034
+                        -68.9950522,
+                        43.8717247
                     ],
                     [
-                        -68.8773544,
-                        43.8117826
+                        -68.9950522,
+                        43.9982022
                     ],
                     [
-                        -68.9402483,
-                        43.8117599
-                    ]
-                ],
-                [
-                    [
-                        -123.1291466,
-                        49.0645144
+                        -68.4963672,
+                        43.9982022
                     ],
                     [
-                        -122.9954224,
-                        49.0645144
+                        -68.4963672,
+                        44.0597368
                     ],
                     [
-                        -122.9954224,
-                        48.9343243
+                        -68.3081038,
+                        44.0597368
                     ],
                     [
-                        -123.1291466,
-                        48.9343243
-                    ]
-                ],
-                [
-                    [
-                        -82.9407144,
-                        24.7535913
+                        -68.3081038,
+                        44.122137
                     ],
                     [
-                        -82.8719398,
-                        24.7535913
+                        -68.1851802,
+                        44.122137
                     ],
                     [
-                        -82.8719398,
-                        24.6905653
+                        -68.1851802,
+                        44.3081382
                     ],
                     [
-                        -82.7446233,
-                        24.6905653
+                        -67.9956019,
+                        44.3081382
                     ],
                     [
-                        -82.7446233,
-                        24.6214593
+                        -67.9956019,
+                        44.3727489
                     ],
                     [
-                        -82.8088038,
-                        24.6214593
+                        -67.8103041,
+                        44.3727489
                     ],
                     [
-                        -82.8088038,
-                        24.5594908
+                        -67.8103041,
+                        44.435178
                     ],
                     [
-                        -82.9407144,
-                        24.5594908
-                    ]
-                ]
-            ]
-        },
-        {
-            "name": "USGS Topographic Maps",
-            "type": "tms",
-            "template": "http://{switch:a,b,c}.tile.openstreetmap.us/usgs_scanned_topos/{zoom}/{x}/{y}.png",
-            "polygon": [
-                [
-                    [
-                        -125.990173,
-                        48.9962416
+                        -67.4965289,
+                        44.435178
                     ],
                     [
-                        -125.989419,
-                        47.9948396
+                        -67.4965289,
+                        44.4968776
                     ],
                     [
-                        -123.9929739,
-                        47.9955062
+                        -67.37102,
+                        44.4968776
                     ],
                     [
-                        -123.9922429,
-                        47.0059202
+                        -67.37102,
+                        44.5600642
                     ],
                     [
-                        -125.988688,
-                        47.0052409
+                        -67.1848753,
+                        44.5600642
                     ],
                     [
-                        -125.9879604,
-                        46.0015618
+                        -67.1848753,
+                        44.6213345
                     ],
                     [
-                        -123.9939396,
-                        46.0022529
+                        -67.1221208,
+                        44.6213345
                     ],
                     [
-                        -123.9925238,
-                        43.9961708
+                        -67.1221208,
+                        44.6867918
                     ],
                     [
-                        -124.9931832,
-                        43.9958116
+                        -67.059365,
+                        44.6867918
                     ],
                     [
-                        -124.9918175,
-                        41.9942149
+                        -67.059365,
+                        44.7473657
                     ],
                     [
-                        -125.9851789,
-                        41.9938465
+                        -66.9311098,
+                        44.7473657
                     ],
                     [
-                        -125.9838655,
-                        40.0076111
+                        -66.9311098,
+                        44.9406566
                     ],
                     [
-                        -123.9833285,
-                        40.0083757
+                        -66.994683,
+                        44.9406566
                     ],
                     [
-                        -123.9814115,
-                        37.002615
+                        -66.994683,
+                        45.0024514
                     ],
                     [
-                        -122.21903,
-                        37.0033173
+                        -67.0595847,
+                        45.0024514
                     ],
                     [
-                        -122.2184144,
-                        36.011671
+                        -67.0595847,
+                        45.1273377
                     ],
                     [
-                        -122.020087,
-                        36.011751
+                        -67.1201974,
+                        45.1273377
                     ],
                     [
-                        -122.0188591,
-                        33.9961766
+                        -67.1201974,
+                        45.1910115
                     ],
                     [
-                        -119.9787757,
-                        33.9970206
+                        -67.2469811,
+                        45.1910115
                     ],
                     [
-                        -119.9775867,
-                        31.9987658
+                        -67.2469811,
+                        45.253442
                     ],
                     [
-                        -114.0122833,
-                        32.00129
+                        -67.3177546,
+                        45.253442
                     ],
                     [
-                        -114.0116894,
-                        30.9862401
+                        -67.3177546,
+                        45.1898369
                     ],
                     [
-                        -105.998294,
-                        30.9896679
+                        -67.370749,
+                        45.1898369
                     ],
                     [
-                        -105.9971419,
-                        28.9901065
+                        -67.370749,
+                        45.2534001
                     ],
                     [
-                        -102.0210506,
-                        28.9918418
+                        -67.4326888,
+                        45.2534001
                     ],
                     [
-                        -102.0204916,
-                        28.00733
+                        -67.4326888,
+                        45.3083409
                     ],
                     [
-                        -100.0062436,
-                        28.0082173
+                        -67.3708571,
+                        45.3083409
                     ],
                     [
-                        -100.0051143,
-                        25.991909
+                        -67.3708571,
+                        45.4396986
                     ],
                     [
-                        -98.0109067,
-                        25.9928035
+                        -67.4305573,
+                        45.4396986
                     ],
                     [
-                        -98.0103613,
-                        25.0063461
+                        -67.4305573,
+                        45.4950095
                     ],
                     [
-                        -97.0161086,
-                        25.0067957
+                        -67.37099,
+                        45.4950095
                     ],
                     [
-                        -97.016654,
-                        25.9932494
+                        -67.37099,
+                        45.6264543
                     ],
                     [
-                        -95.9824825,
-                        25.9937132
+                        -67.6214982,
+                        45.6264543
                     ],
                     [
-                        -95.9835999,
-                        27.9891175
+                        -67.6214982,
+                        45.6896133
                     ],
                     [
-                        -94.0200898,
-                        27.9899826
+                        -67.683828,
+                        45.6896133
                     ],
                     [
-                        -94.0206586,
-                        28.9918129
+                        -67.683828,
+                        45.753259
                     ],
                     [
-                        -88.0156706,
-                        28.9944338
+                        -67.7462097,
+                        45.753259
                     ],
                     [
-                        -88.0162494,
-                        30.0038862
+                        -67.7462097,
+                        47.1268165
                     ],
                     [
-                        -86.0277506,
-                        30.0047454
+                        -67.8700141,
+                        47.1268165
                     ],
                     [
-                        -86.0271719,
-                        28.9953016
+                        -67.8700141,
+                        47.1900278
                     ],
                     [
-                        -84.0187909,
-                        28.9961781
+                        -67.9323803,
+                        47.1900278
                     ],
                     [
-                        -84.017095,
-                        25.9817708
+                        -67.9323803,
+                        47.2539678
                     ],
                     [
-                        -81.9971976,
-                        25.9826768
+                        -67.9959387,
+                        47.2539678
                     ],
                     [
-                        -81.9966618,
-                        25.0134917
+                        -67.9959387,
+                        47.3149737
                     ],
                     [
-                        -84.0165592,
-                        25.0125783
+                        -68.1206676,
+                        47.3149737
                     ],
                     [
-                        -84.0160068,
-                        24.0052745
+                        -68.1206676,
+                        47.3780823
                     ],
                     [
-                        -80.0199985,
-                        24.007096
+                        -68.4423175,
+                        47.3780823
                     ],
                     [
-                        -80.0245309,
-                        32.0161282
+                        -68.4423175,
+                        47.3166082
                     ],
                     [
-                        -78.0066484,
-                        32.0169819
+                        -68.6314305,
+                        47.3166082
                     ],
                     [
-                        -78.0072238,
-                        32.9894278
+                        -68.6314305,
+                        47.2544676
                     ],
                     [
-                        -77.8807233,
-                        32.9894807
+                        -68.9978037,
+                        47.2544676
                     ],
                     [
-                        -77.8813253,
-                        33.9955918
+                        -68.9978037,
+                        47.439895
                     ],
                     [
-                        -76.0115411,
-                        33.9963653
+                        -69.0607223,
+                        47.439895
                     ],
                     [
-                        -76.0121459,
-                        34.9952552
+                        -69.0607223,
+                        47.5047558
                     ],
                     [
-                        -74.0068449,
-                        34.9960749
+                        -69.2538122,
+                        47.5047558
                     ],
                     [
-                        -74.0099997,
-                        40.0084254
+                        -69.2538122,
+                        47.4398084
                     ],
                     [
-                        -72.0013745,
-                        40.0091931
+                        -69.3179284,
+                        47.4398084
                     ],
                     [
-                        -72.002019,
-                        40.9912464
+                        -69.3179284,
+                        47.378601
                     ],
                     [
-                        -69.8797398,
-                        40.9920457
+                        -69.4438546,
+                        47.378601
                     ],
                     [
-                        -69.8804173,
-                        42.00893
+                        -69.4438546,
+                        47.3156274
                     ],
                     [
-                        -69.9927682,
-                        42.0088883
+                        -69.5038204,
+                        47.3156274
                     ],
                     [
-                        -69.9934462,
-                        43.0105166
+                        -69.5038204,
+                        47.2525839
                     ],
                     [
-                        -67.9845366,
-                        43.0112496
+                        -69.5667838,
+                        47.2525839
                     ],
                     [
-                        -67.985224,
-                        44.0103812
+                        -69.5667838,
+                        47.1910884
                     ],
                     [
-                        -65.9892568,
-                        44.0110975
+                        -69.6303478,
+                        47.1910884
                     ],
                     [
-                        -65.9921237,
-                        47.9993584
+                        -69.6303478,
+                        47.128701
                     ],
                     [
-                        -70.006442,
-                        47.9980181
+                        -69.6933103,
+                        47.128701
                     ],
                     [
-                        -70.005708,
-                        47.0042007
+                        -69.6933103,
+                        47.0654307
                     ],
                     [
-                        -72.023686,
-                        47.003514
+                        -69.7557063,
+                        47.0654307
                     ],
                     [
-                        -72.0222508,
-                        45.0059846
+                        -69.7557063,
+                        47.0042751
                     ],
                     [
-                        -78.0146667,
-                        45.0038705
+                        -69.8180391,
+                        47.0042751
                     ],
                     [
-                        -78.0139662,
-                        44.0026998
+                        -69.8180391,
+                        46.9415344
                     ],
                     [
-                        -80.029686,
-                        44.0019763
+                        -69.8804023,
+                        46.9415344
                     ],
                     [
-                        -80.0290052,
-                        43.0122994
+                        -69.8804023,
+                        46.8792519
                     ],
                     [
-                        -81.995479,
-                        43.011582
+                        -69.9421674,
+                        46.8792519
                     ],
                     [
-                        -81.9982986,
-                        47.0042713
+                        -69.9421674,
+                        46.8177399
                     ],
                     [
-                        -87.505706,
-                        47.0023972
+                        -70.0063088,
+                        46.8177399
                     ],
                     [
-                        -87.5064535,
-                        48.0142702
+                        -70.0063088,
+                        46.6920295
                     ],
                     [
-                        -88.0260889,
-                        48.0140968
+                        -70.0704265,
+                        46.6920295
                     ],
                     [
-                        -88.026838,
-                        49.0086686
+                        -70.0704265,
+                        46.4425926
                     ],
                     [
-                        -93.9981078,
-                        49.0067142
+                        -70.1945902,
+                        46.4425926
                     ],
                     [
-                        -93.9988778,
-                        50.0086456
+                        -70.1945902,
+                        46.3785887
                     ],
                     [
-                        -96.0138899,
-                        50.0079995
+                        -70.2562047,
+                        46.3785887
                     ],
                     [
-                        -96.0131199,
-                        49.0060547
-                    ]
-                ],
-                [
+                        -70.2562047,
+                        46.3152628
+                    ],
                     [
-                        -160.5787616,
-                        22.5062947
+                        -70.3203651,
+                        46.3152628
                     ],
                     [
-                        -160.5782192,
-                        21.4984647
+                        -70.3203651,
+                        46.0651209
                     ],
                     [
-                        -159.0030121,
-                        21.499196
+                        -70.3814988,
+                        46.0651209
                     ],
                     [
-                        -159.0027422,
-                        20.9951068
+                        -70.3814988,
+                        45.93552
                     ],
                     [
-                        -157.5083185,
-                        20.995803
+                        -70.3201618,
+                        45.93552
                     ],
                     [
-                        -157.5080519,
-                        20.4960241
+                        -70.3201618,
+                        45.879479
                     ],
                     [
-                        -155.966889,
-                        20.4967444
+                        -70.4493131,
+                        45.879479
                     ],
                     [
-                        -155.9674267,
-                        21.5028287
+                        -70.4493131,
+                        45.7538713
                     ],
                     [
-                        -157.5044717,
-                        21.5021151
+                        -70.5070021,
+                        45.7538713
                     ],
                     [
-                        -157.5047384,
-                        21.9984962
+                        -70.5070021,
+                        45.6916912
                     ],
                     [
-                        -159.0090946,
-                        21.9978002
+                        -70.6316642,
+                        45.6916912
                     ],
                     [
-                        -159.0093692,
-                        22.5070181
-                    ]
-                ],
-                [
-                    [
-                        -168.006102,
-                        68.9941463
+                        -70.6316642,
+                        45.6291619
                     ],
                     [
-                        -168.0047628,
-                        68.0107853
+                        -70.7575538,
+                        45.6291619
                     ],
                     [
-                        -165.4842481,
-                        68.0112562
+                        -70.7575538,
+                        45.4414685
                     ],
                     [
-                        -165.4829337,
-                        67.0037303
+                        -70.8809878,
+                        45.4414685
                     ],
                     [
-                        -168.0034485,
-                        67.0032389
+                        -70.8809878,
+                        45.3780612
                     ],
                     [
-                        -168.002195,
-                        66.0017503
+                        -71.13328,
+                        45.3780612
                     ],
                     [
-                        -169.0087448,
-                        66.001546
+                        -71.13328,
+                        45.3151452
                     ],
                     [
-                        -169.0075381,
-                        64.9987675
+                        -71.3830282,
+                        45.3151452
                     ],
                     [
-                        -168.0009882,
-                        64.9989798
+                        -71.3830282,
+                        45.253416
                     ],
                     [
-                        -167.9998282,
-                        63.9982374
+                        -71.5076448,
+                        45.253416
                     ],
                     [
-                        -164.9871288,
-                        63.9988964
+                        -71.5076448,
+                        45.0655726
                     ],
                     [
-                        -164.9860062,
-                        62.9950845
+                        -73.9418929,
+                        45.0655726
                     ],
                     [
-                        -167.9987057,
-                        62.9944019
+                        -73.9418929,
+                        45.0031242
                     ],
                     [
-                        -167.9946035,
-                        59.0153692
+                        -74.7469725,
+                        45.0031242
                     ],
                     [
-                        -162.5027857,
-                        59.0167799
+                        -74.7469725,
+                        45.0649003
                     ],
                     [
-                        -162.5018149,
-                        58.0005815
+                        -74.8800964,
+                        45.0649003
                     ],
                     [
-                        -160.0159024,
-                        58.0012389
+                        -74.8800964,
+                        45.0029023
                     ],
                     [
-                        -160.0149725,
-                        57.000035
+                        -75.0662455,
+                        45.0029023
                     ],
                     [
-                        -160.5054788,
-                        56.9999017
+                        -75.0662455,
+                        44.9415167
                     ],
                     [
-                        -160.5045719,
-                        55.9968161
+                        -75.2539363,
+                        44.9415167
                     ],
                     [
-                        -164.012195,
-                        55.9958373
+                        -75.2539363,
+                        44.8776043
                     ],
                     [
-                        -164.0113186,
-                        55.00107
+                        -75.3789648,
+                        44.8776043
                     ],
                     [
-                        -165.994782,
-                        55.0005023
+                        -75.3789648,
+                        44.8153462
                     ],
                     [
-                        -165.9941266,
-                        54.2400584
+                        -75.4431283,
+                        44.8153462
                     ],
                     [
-                        -168.0002944,
-                        54.2394734
+                        -75.4431283,
+                        44.7536053
                     ],
                     [
-                        -168.0000986,
-                        54.0094921
+                        -75.5666566,
+                        44.7536053
                     ],
                     [
-                        -170.0156134,
-                        54.0089011
+                        -75.5666566,
+                        44.6909879
                     ],
                     [
-                        -170.0147683,
-                        53.0016446
+                        -75.6290205,
+                        44.6909879
                     ],
                     [
-                        -171.9993636,
-                        53.0010487
+                        -75.6290205,
+                        44.6284958
                     ],
                     [
-                        -171.9989488,
-                        52.4977745
+                        -75.7540484,
+                        44.6284958
                     ],
                     [
-                        -176.0083239,
-                        52.4965566
+                        -75.7540484,
+                        44.566385
                     ],
                     [
-                        -176.0081186,
-                        52.2452555
+                        -75.817312,
+                        44.566385
                     ],
                     [
-                        -178.000097,
-                        52.2446469
+                        -75.817312,
+                        44.5028932
                     ],
                     [
-                        -177.9992996,
-                        51.2554252
+                        -75.8799549,
+                        44.5028932
                     ],
                     [
-                        -176.0073212,
-                        51.2560472
+                        -75.8799549,
+                        44.3784946
                     ],
                     [
-                        -176.0075146,
-                        51.4980163
+                        -76.1300319,
+                        44.3784946
                     ],
                     [
-                        -171.9981395,
-                        51.4992617
+                        -76.1300319,
+                        44.3159227
                     ],
                     [
-                        -171.9985419,
-                        51.9985373
+                        -76.1926961,
+                        44.3159227
                     ],
                     [
-                        -167.9984317,
-                        51.9997661
+                        -76.1926961,
+                        44.2534378
                     ],
                     [
-                        -167.9994645,
-                        53.2560877
+                        -76.3182619,
+                        44.2534378
                     ],
                     [
-                        -165.9932968,
-                        53.2566866
+                        -76.3182619,
+                        44.1916726
                     ],
                     [
-                        -165.9939308,
-                        54.0100804
+                        -76.3792975,
+                        44.1916726
                     ],
                     [
-                        -159.0067205,
-                        54.0121291
+                        -76.3792975,
+                        44.0653733
                     ],
                     [
-                        -159.0075717,
-                        55.002502
+                        -76.4427584,
+                        44.0653733
                     ],
                     [
-                        -158.0190709,
-                        55.0027849
+                        -76.4427584,
+                        43.9963825
                     ],
                     [
-                        -158.0199473,
-                        55.9975094
+                        -76.317027,
+                        43.9963825
                     ],
                     [
-                        -151.9963213,
-                        55.9991902
+                        -76.317027,
+                        43.9414581
                     ],
                     [
-                        -151.9981536,
-                        57.9986536
+                        -76.5076611,
+                        43.9414581
                     ],
                     [
-                        -151.500341,
-                        57.9987853
+                        -76.5076611,
+                        43.8723335
                     ],
                     [
-                        -151.5012894,
-                        58.9919816
+                        -76.3829974,
+                        43.8723335
                     ],
                     [
-                        -138.5159989,
-                        58.9953194
+                        -76.3829974,
+                        43.8091872
                     ],
                     [
-                        -138.5150471,
-                        57.9986434
+                        -76.2534102,
+                        43.8091872
                     ],
                     [
-                        -136.6872422,
-                        57.9991267
+                        -76.2534102,
+                        43.5665222
                     ],
                     [
-                        -136.6863158,
-                        57.0016688
+                        -76.5064833,
+                        43.5665222
                     ],
                     [
-                        -135.9973698,
-                        57.001856
+                        -76.5064833,
+                        43.5033881
                     ],
                     [
-                        -135.9964667,
-                        56.0030544
+                        -76.6331208,
+                        43.5033881
                     ],
                     [
-                        -134.6717732,
-                        56.003424
+                        -76.6331208,
+                        43.4432252
                     ],
                     [
-                        -134.6708865,
-                        54.9969623
+                        -76.6951085,
+                        43.4432252
                     ],
                     [
-                        -133.9956734,
-                        54.9971556
+                        -76.6951085,
+                        43.3786858
                     ],
                     [
-                        -133.9948193,
-                        54.0031685
+                        -76.8177798,
+                        43.3786858
                     ],
                     [
-                        -130.0044418,
-                        54.0043387
+                        -76.8177798,
+                        43.318066
                     ],
                     [
-                        -130.0070826,
-                        57.0000507
+                        -77.682,
+                        43.318066
                     ],
                     [
-                        -131.975877,
-                        56.9995156
+                        -77.682,
+                        43.3789376
                     ],
                     [
-                        -131.9787378,
-                        59.9933094
+                        -78.0565883,
+                        43.3789376
                     ],
                     [
-                        -138.0071813,
-                        59.991805
+                        -78.0565883,
+                        43.4396918
                     ],
                     [
-                        -138.0082158,
-                        61.0125755
+                        -78.4389748,
+                        43.4396918
                     ],
                     [
-                        -140.9874011,
-                        61.0118551
+                        -78.4389748,
+                        43.3794382
                     ],
                     [
-                        -140.99984,
-                        71.0039309
+                        -78.8803396,
+                        43.3794382
                     ],
                     [
-                        -154.5023956,
-                        71.0017377
+                        -78.8803396,
+                        43.3149724
                     ],
                     [
-                        -154.5039632,
-                        71.9983391
+                        -79.1298858,
+                        43.3149724
                     ],
                     [
-                        -157.499048,
-                        71.9978773
+                        -79.1298858,
+                        43.2429286
                     ],
                     [
-                        -157.4974758,
-                        70.9982877
+                        -79.0669615,
+                        43.2429286
                     ],
                     [
-                        -163.0233611,
-                        70.9973899
+                        -79.0669615,
+                        43.1299931
                     ],
                     [
-                        -163.0218273,
-                        69.9707435
+                        -79.1298858,
+                        43.1299931
                     ],
                     [
-                        -164.9730896,
-                        69.97041
+                        -79.1298858,
+                        43.0577305
                     ],
                     [
-                        -164.9717003,
-                        68.994689
-                    ]
-                ],
-                [
-                    [
-                        -168.5133204,
-                        62.8689586
+                        -79.071264,
+                        43.0577305
                     ],
                     [
-                        -168.5144423,
-                        63.8765677
+                        -79.071264,
+                        42.9294906
                     ],
                     [
-                        -172.0202755,
-                        63.8757975
+                        -78.943264,
+                        42.9294906
                     ],
                     [
-                        -172.0191536,
-                        62.8681608
-                    ]
-                ],
-                [
-                    [
-                        -170.9947111,
-                        59.9954089
+                        -78.943264,
+                        42.7542165
                     ],
                     [
-                        -170.995726,
-                        60.9969787
+                        -79.069439,
+                        42.7542165
                     ],
                     [
-                        -174.0045311,
-                        60.9962508
+                        -79.069439,
+                        42.6941622
                     ],
                     [
-                        -174.0035162,
-                        59.9946581
-                    ]
-                ],
-                [
-                    [
-                        -156.0717261,
-                        20.2854602
+                        -79.133439,
+                        42.6941622
                     ],
                     [
-                        -154.7940471,
-                        20.2860582
+                        -79.133439,
+                        42.6296973
                     ],
                     [
-                        -154.7933145,
-                        18.9029464
+                        -79.1947499,
+                        42.6296973
                     ],
                     [
-                        -156.0709936,
-                        18.9023432
-                    ]
-                ]
-            ]
-        },
-        {
-            "name": "Vejmidte (Denmark)",
-            "type": "tms",
-            "template": "http://{switch:a,b,c}.tile.openstreetmap.dk/danmark/vejmidte/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                0,
-                20
-            ],
-            "polygon": [
-                [
+                        -79.1947499,
+                        42.5663538
+                    ],
                     [
-                        8.3743941,
-                        54.9551655
+                        -79.3786827,
+                        42.5663538
                     ],
                     [
-                        8.3683809,
-                        55.4042149
+                        -79.3786827,
+                        42.5033425
                     ],
                     [
-                        8.2103997,
-                        55.4039795
+                        -79.4442961,
+                        42.5033425
                     ],
                     [
-                        8.2087314,
-                        55.4937345
+                        -79.4442961,
+                        42.4410614
                     ],
                     [
-                        8.0502655,
-                        55.4924731
+                        -79.5679936,
+                        42.4410614
                     ],
                     [
-                        8.0185123,
-                        56.7501399
+                        -79.5679936,
+                        42.3775264
                     ],
                     [
-                        8.1819161,
-                        56.7509948
+                        -79.6906154,
+                        42.3775264
                     ],
                     [
-                        8.1763274,
-                        57.0208898
+                        -79.6906154,
+                        42.3171086
                     ],
                     [
-                        8.3413329,
-                        57.0219872
+                        -79.8164642,
+                        42.3171086
                     ],
                     [
-                        8.3392467,
-                        57.1119574
+                        -79.8164642,
+                        42.2534481
                     ],
                     [
-                        8.5054433,
-                        57.1123212
+                        -80.0052373,
+                        42.2534481
                     ],
                     [
-                        8.5033923,
-                        57.2020499
+                        -80.0052373,
+                        42.1909188
                     ],
                     [
-                        9.3316304,
-                        57.2027636
+                        -80.1916829,
+                        42.1909188
                     ],
                     [
-                        9.3319079,
-                        57.2924835
+                        -80.1916829,
+                        42.1272555
                     ],
                     [
-                        9.4978864,
-                        57.2919578
+                        -80.3167992,
+                        42.1272555
                     ],
                     [
-                        9.4988593,
-                        57.3820608
+                        -80.3167992,
+                        42.0669857
                     ],
                     [
-                        9.6649749,
-                        57.3811615
+                        -80.5063234,
+                        42.0669857
                     ],
                     [
-                        9.6687295,
-                        57.5605591
+                        -80.5063234,
+                        42.0034331
                     ],
                     [
-                        9.8351961,
-                        57.5596265
+                        -80.6930471,
+                        42.0034331
                     ],
                     [
-                        9.8374896,
-                        57.6493322
+                        -80.6930471,
+                        41.9415141
                     ],
                     [
-                        10.1725726,
-                        57.6462818
+                        -80.9440403,
+                        41.9415141
                     ],
                     [
-                        10.1754245,
-                        57.7367768
+                        -80.9440403,
+                        41.8781193
                     ],
                     [
-                        10.5118282,
-                        57.7330269
+                        -81.1942729,
+                        41.8781193
                     ],
                     [
-                        10.5152095,
-                        57.8228945
+                        -81.1942729,
+                        41.8166455
                     ],
                     [
-                        10.6834853,
-                        57.8207722
+                        -81.3190089,
+                        41.8166455
                     ],
                     [
-                        10.6751613,
-                        57.6412021
+                        -81.3190089,
+                        41.7545453
                     ],
                     [
-                        10.5077045,
-                        57.6433097
+                        -81.4418435,
+                        41.7545453
                     ],
                     [
-                        10.5039992,
-                        57.5535088
+                        -81.4418435,
+                        41.690965
                     ],
                     [
-                        10.671038,
-                        57.5514113
+                        -81.5053523,
+                        41.690965
                     ],
                     [
-                        10.6507805,
-                        57.1024538
+                        -81.5053523,
+                        41.6301643
                     ],
                     [
-                        10.4857673,
-                        57.1045138
+                        -82.7470081,
+                        41.6301643
                     ],
                     [
-                        10.4786236,
-                        56.9249051
+                        -82.7470081,
+                        41.7536942
                     ],
                     [
-                        10.3143981,
-                        56.9267573
+                        -82.8839135,
+                        41.7536942
                     ],
                     [
-                        10.3112341,
-                        56.8369269
+                        -82.8839135,
+                        41.5656075
                     ],
                     [
-                        10.4750295,
-                        56.83509
+                        -82.9957195,
+                        41.5656075
                     ],
                     [
-                        10.4649016,
-                        56.5656681
+                        -82.9957195,
+                        41.6270375
                     ],
                     [
-                        10.9524239,
-                        56.5589761
+                        -83.1257796,
+                        41.6270375
                     ],
                     [
-                        10.9479249,
-                        56.4692243
+                        -83.1257796,
+                        41.6878411
                     ],
                     [
-                        11.1099335,
-                        56.4664675
+                        -83.2474733,
+                        41.6878411
                     ],
                     [
-                        11.1052639,
-                        56.376833
+                        -83.2474733,
+                        41.7536942
                     ],
                     [
-                        10.9429901,
-                        56.3795284
+                        -83.3737305,
+                        41.7536942
                     ],
                     [
-                        10.9341235,
-                        56.1994768
+                        -83.3737305,
+                        41.809276
                     ],
                     [
-                        10.7719685,
-                        56.2020244
+                        -83.3106019,
+                        41.809276
                     ],
                     [
-                        10.7694751,
-                        56.1120103
+                        -83.3106019,
+                        41.8716064
                     ],
                     [
-                        10.6079695,
-                        56.1150259
+                        -83.2474733,
+                        41.8716064
                     ],
                     [
-                        10.4466742,
-                        56.116717
+                        -83.2474733,
+                        41.9361393
                     ],
                     [
-                        10.2865948,
-                        56.118675
+                        -83.1843447,
+                        41.9361393
                     ],
                     [
-                        10.2831527,
-                        56.0281851
+                        -83.1843447,
+                        41.9960851
                     ],
                     [
-                        10.4439274,
-                        56.0270388
+                        -83.1207681,
+                        41.9960851
                     ],
                     [
-                        10.4417713,
-                        55.7579243
+                        -83.1207681,
+                        42.2464812
                     ],
                     [
-                        10.4334961,
-                        55.6693533
+                        -83.0589194,
+                        42.2464812
                     ],
                     [
-                        10.743814,
-                        55.6646861
+                        -83.0589194,
+                        42.3089555
                     ],
                     [
-                        10.743814,
-                        55.5712253
+                        -82.8685328,
+                        42.3089555
                     ],
                     [
-                        10.8969041,
-                        55.5712253
+                        -82.8685328,
+                        42.3717652
                     ],
                     [
-                        10.9051793,
-                        55.3953852
+                        -82.8072219,
+                        42.3717652
                     ],
                     [
-                        11.0613726,
-                        55.3812841
+                        -82.8072219,
+                        42.558553
                     ],
                     [
-                        11.0593038,
-                        55.1124061
+                        -82.7553745,
+                        42.558553
                     ],
                     [
-                        11.0458567,
-                        55.0318621
+                        -82.7553745,
+                        42.4954945
                     ],
                     [
-                        11.2030844,
-                        55.0247474
+                        -82.5599041,
+                        42.4954945
                     ],
                     [
-                        11.2030844,
-                        55.117139
+                        -82.5599041,
+                        42.558553
                     ],
                     [
-                        11.0593038,
-                        55.1124061
+                        -82.4967755,
+                        42.558553
                     ],
                     [
-                        11.0613726,
-                        55.3812841
+                        -82.4967755,
+                        42.6833607
                     ],
                     [
-                        11.0789572,
-                        55.5712253
+                        -82.4328863,
+                        42.6833607
                     ],
                     [
-                        10.8969041,
-                        55.5712253
+                        -82.4328863,
+                        42.9342196
                     ],
                     [
-                        10.9258671,
-                        55.6670198
+                        -82.3700552,
+                        42.9342196
                     ],
                     [
-                        10.743814,
-                        55.6646861
+                        -82.3700552,
+                        43.0648071
                     ],
                     [
-                        10.7562267,
-                        55.7579243
+                        -82.4328863,
+                        43.0648071
                     ],
                     [
-                        10.4417713,
-                        55.7579243
+                        -82.4328863,
+                        43.1917566
                     ],
                     [
-                        10.4439274,
-                        56.0270388
+                        -82.4947464,
+                        43.1917566
                     ],
                     [
-                        10.4466742,
-                        56.116717
+                        -82.4947464,
+                        43.5034627
                     ],
                     [
-                        10.6079695,
-                        56.1150259
+                        -82.557133,
+                        43.5034627
                     ],
                     [
-                        10.6052053,
-                        56.0247462
+                        -82.557133,
+                        43.8160901
                     ],
                     [
-                        10.9258671,
-                        56.0201215
+                        -82.6197884,
+                        43.8160901
                     ],
                     [
-                        10.9197132,
-                        55.9309388
+                        -82.6197884,
+                        43.9422098
                     ],
                     [
-                        11.0802782,
-                        55.92792
+                        -82.6839499,
+                        43.9422098
                     ],
                     [
-                        11.0858066,
-                        56.0178284
+                        -82.6839499,
+                        44.0022641
                     ],
                     [
-                        11.7265047,
-                        56.005058
+                        -82.7465346,
+                        44.0022641
                     ],
                     [
-                        11.7319981,
-                        56.0952142
+                        -82.7465346,
+                        44.0670545
                     ],
                     [
-                        12.0540333,
-                        56.0871256
+                        -82.8708696,
+                        44.0670545
                     ],
                     [
-                        12.0608477,
-                        56.1762576
+                        -82.8708696,
+                        44.1291935
                     ],
                     [
-                        12.7023469,
-                        56.1594405
+                        -83.008517,
+                        44.1291935
                     ],
                     [
-                        12.6611131,
-                        55.7114318
+                        -83.008517,
+                        44.0664786
                     ],
                     [
-                        12.9792318,
-                        55.7014026
+                        -83.1336086,
+                        44.0664786
                     ],
                     [
-                        12.9612912,
-                        55.5217294
+                        -83.1336086,
+                        44.0053949
                     ],
                     [
-                        12.3268659,
-                        55.5412096
+                        -83.2414522,
+                        44.0053949
                     ],
                     [
-                        12.3206071,
-                        55.4513655
+                        -83.2414522,
+                        44.9962034
                     ],
                     [
-                        12.4778226,
-                        55.447067
+                        -83.1806112,
+                        44.9962034
                     ],
                     [
-                        12.4702432,
-                        55.3570479
+                        -83.1806112,
+                        45.067302
                     ],
                     [
-                        12.6269738,
-                        55.3523837
+                        -83.2455172,
+                        45.067302
                     ],
                     [
-                        12.6200898,
-                        55.2632576
+                        -83.2455172,
+                        45.1287382
                     ],
                     [
-                        12.4627339,
-                        55.26722
+                        -83.3065878,
+                        45.1287382
                     ],
                     [
-                        12.4552949,
-                        55.1778223
+                        -83.3065878,
+                        45.2551509
                     ],
                     [
-                        12.2987046,
-                        55.1822303
+                        -83.3706087,
+                        45.2551509
                     ],
                     [
-                        12.2897344,
-                        55.0923641
+                        -83.3706087,
+                        45.3165923
                     ],
                     [
-                        12.6048608,
-                        55.0832904
+                        -83.4325644,
+                        45.3165923
                     ],
                     [
-                        12.5872011,
-                        54.9036285
+                        -83.4325644,
+                        45.3792105
                     ],
                     [
-                        12.2766618,
-                        54.9119031
+                        -83.6178415,
+                        45.3792105
                     ],
                     [
-                        12.2610181,
-                        54.7331602
+                        -83.6178415,
+                        45.4419665
                     ],
                     [
-                        12.1070691,
-                        54.7378161
+                        -83.8084291,
+                        45.4419665
                     ],
                     [
-                        12.0858621,
-                        54.4681655
+                        -83.8084291,
+                        45.5036189
                     ],
                     [
-                        11.7794953,
-                        54.4753579
+                        -84.0550718,
+                        45.5036189
                     ],
                     [
-                        11.7837381,
-                        54.5654783
+                        -84.0550718,
+                        45.5647907
                     ],
                     [
-                        11.1658525,
-                        54.5782155
+                        -84.1235181,
+                        45.5647907
                     ],
                     [
-                        11.1706443,
-                        54.6686508
+                        -84.1235181,
+                        45.6287845
                     ],
                     [
-                        10.8617173,
-                        54.6733956
+                        -84.1807534,
+                        45.6287845
                     ],
                     [
-                        10.8651245,
-                        54.7634667
+                        -84.1807534,
+                        45.6914688
                     ],
                     [
-                        10.7713646,
-                        54.7643888
+                        -84.3111554,
+                        45.6914688
                     ],
                     [
-                        10.7707276,
-                        54.7372807
+                        -84.3111554,
+                        45.9337076
                     ],
                     [
-                        10.7551428,
-                        54.7375776
+                        -83.8209974,
+                        45.9337076
                     ],
                     [
-                        10.7544039,
-                        54.7195666
+                        -83.8209974,
+                        45.8725113
                     ],
                     [
-                        10.7389074,
-                        54.7197588
+                        -83.4968086,
+                        45.8725113
                     ],
                     [
-                        10.7384368,
-                        54.7108482
+                        -83.4968086,
+                        45.9337076
                     ],
                     [
-                        10.7074486,
-                        54.7113045
+                        -83.4338066,
+                        45.9337076
                     ],
                     [
-                        10.7041094,
-                        54.6756741
+                        -83.4338066,
+                        46.0016863
                     ],
                     [
-                        10.5510973,
-                        54.6781698
+                        -83.4962697,
+                        46.0016863
                     ],
                     [
-                        10.5547184,
-                        54.7670245
+                        -83.4962697,
+                        46.0668178
                     ],
                     [
-                        10.2423994,
-                        54.7705935
+                        -83.5599956,
+                        46.0668178
                     ],
                     [
-                        10.2459845,
-                        54.8604673
+                        -83.5599956,
+                        46.1261576
                     ],
                     [
-                        10.0902268,
-                        54.8622134
+                        -83.9954558,
+                        46.1261576
                     ],
                     [
-                        10.0873731,
-                        54.7723851
+                        -83.9954558,
+                        46.1931747
                     ],
                     [
-                        9.1555798,
-                        54.7769557
+                        -84.0591816,
+                        46.1931747
                     ],
                     [
-                        9.1562752,
-                        54.8675369
+                        -84.0591816,
+                        46.3814972
                     ],
                     [
-                        8.5321973,
-                        54.8663765
+                        -84.1152614,
+                        46.3814972
                     ],
                     [
-                        8.531432,
-                        54.95516
-                    ]
-                ],
-                [
+                        -84.1152614,
+                        46.4953584
+                    ],
                     [
-                        11.4577738,
-                        56.819554
+                        -84.0591816,
+                        46.4953584
                     ],
                     [
-                        11.7849181,
-                        56.8127385
+                        -84.0591816,
+                        46.5682653
                     ],
                     [
-                        11.7716715,
-                        56.6332796
+                        -84.2579545,
+                        46.5682653
                     ],
                     [
-                        11.4459621,
-                        56.6401087
-                    ]
-                ],
-                [
+                        -84.2579545,
+                        46.5051232
+                    ],
                     [
-                        11.3274736,
-                        57.3612962
+                        -84.3071879,
+                        46.5051232
                     ],
                     [
-                        11.3161808,
-                        57.1818004
+                        -84.3071879,
+                        46.5682653
                     ],
                     [
-                        11.1508692,
-                        57.1847276
+                        -84.4415364,
+                        46.5682653
                     ],
                     [
-                        11.1456628,
-                        57.094962
+                        -84.4415364,
+                        46.504525
                     ],
                     [
-                        10.8157703,
-                        57.1001693
+                        -84.9965729,
+                        46.504525
                     ],
                     [
-                        10.8290599,
-                        57.3695272
-                    ]
-                ],
-                [
+                        -84.9965729,
+                        46.6842882
+                    ],
                     [
-                        11.5843266,
-                        56.2777928
+                        -84.9298158,
+                        46.6842882
                     ],
                     [
-                        11.5782882,
-                        56.1880397
+                        -84.9298158,
+                        46.818077
                     ],
                     [
-                        11.7392309,
-                        56.1845765
+                        -85.3165894,
+                        46.818077
                     ],
                     [
-                        11.7456428,
-                        56.2743186
-                    ]
-                ],
-                [
+                        -85.3165894,
+                        46.7535825
+                    ],
                     [
-                        14.6825922,
-                        55.3639405
+                        -87.5562645,
+                        46.7535825
                     ],
                     [
-                        14.8395247,
-                        55.3565231
+                        -87.5562645,
+                        47.4407371
                     ],
                     [
-                        14.8263755,
-                        55.2671261
+                        -87.6825361,
+                        47.4407371
                     ],
                     [
-                        15.1393406,
-                        55.2517359
+                        -87.6825361,
+                        47.5035554
                     ],
                     [
-                        15.1532015,
-                        55.3410836
+                        -88.2560738,
+                        47.5035554
                     ],
                     [
-                        15.309925,
-                        55.3330556
+                        -88.2560738,
+                        47.4433716
                     ],
                     [
-                        15.295719,
-                        55.2437356
+                        -88.4417419,
+                        47.4433716
                     ],
                     [
-                        15.1393406,
-                        55.2517359
+                        -88.4417419,
+                        47.3789949
                     ],
                     [
-                        15.1255631,
-                        55.1623802
+                        -88.50683,
+                        47.3789949
                     ],
                     [
-                        15.2815819,
-                        55.1544167
+                        -88.50683,
+                        47.3153881
                     ],
                     [
-                        15.2535578,
-                        54.9757646
+                        -88.6312821,
+                        47.3153881
                     ],
                     [
-                        14.6317464,
-                        55.0062496
-                    ]
-                ]
-            ],
-            "terms_url": "http://wiki.openstreetmap.org/wiki/Vejmidte",
-            "terms_text": "Danish municipalities"
-        },
-        {
-            "name": "Vienna: Beschriftungen (annotations)",
-            "type": "tms",
-            "template": "http://www.wien.gv.at/wmts/beschriftung/normal/google3857/{zoom}/{y}/{x}.png",
-            "scaleExtent": [
-                0,
-                19
-            ],
-            "polygon": [
-                [
-                    [
-                        16.17,
-                        48.1
+                        -88.6312821,
+                        47.2539782
                     ],
                     [
-                        16.17,
-                        48.33
+                        -88.7569636,
+                        47.2539782
                     ],
                     [
-                        16.58,
-                        48.33
+                        -88.7569636,
+                        47.1934682
                     ],
                     [
-                        16.58,
-                        48.1
+                        -88.8838253,
+                        47.1934682
                     ],
                     [
-                        16.17,
-                        48.1
-                    ]
-                ]
-            ],
-            "terms_url": "http://data.wien.gv.at/",
-            "terms_text": "Stadt Wien"
-        },
-        {
-            "name": "Vienna: Mehrzweckkarte (general purpose)",
-            "type": "tms",
-            "template": "http://www.wien.gv.at/wmts/fmzk/pastell/google3857/{zoom}/{y}/{x}.jpeg",
-            "scaleExtent": [
-                0,
-                19
-            ],
-            "polygon": [
-                [
-                    [
-                        16.17,
-                        48.1
+                        -88.8838253,
+                        47.1284735
                     ],
                     [
-                        16.17,
-                        48.33
+                        -88.9434208,
+                        47.1284735
                     ],
                     [
-                        16.58,
-                        48.33
+                        -88.9434208,
+                        47.0662127
                     ],
                     [
-                        16.58,
-                        48.1
+                        -89.0708726,
+                        47.0662127
                     ],
                     [
-                        16.17,
-                        48.1
-                    ]
-                ]
-            ],
-            "terms_url": "http://data.wien.gv.at/",
-            "terms_text": "Stadt Wien"
-        },
-        {
-            "name": "Vienna: Orthofoto (aerial image)",
-            "type": "tms",
-            "template": "http://www.wien.gv.at/wmts/lb/farbe/google3857/{zoom}/{y}/{x}.jpeg",
-            "scaleExtent": [
-                0,
-                19
-            ],
-            "polygon": [
-                [
-                    [
-                        16.17,
-                        48.1
+                        -89.0708726,
+                        47.0026826
                     ],
                     [
-                        16.17,
-                        48.33
+                        -89.2565553,
+                        47.0026826
                     ],
                     [
-                        16.58,
-                        48.33
+                        -89.2565553,
+                        46.9410806
                     ],
                     [
-                        16.58,
-                        48.1
+                        -90.3677669,
+                        46.9410806
                     ],
                     [
-                        16.17,
-                        48.1
-                    ]
-                ]
-            ],
-            "terms_url": "http://data.wien.gv.at/",
-            "terms_text": "Stadt Wien"
-        },
-        {
-            "name": "basemap.at",
-            "type": "tms",
-            "description": "Basemap of Austria, based on goverment data.",
-            "template": "http://maps.wien.gv.at/basemap/geolandbasemap/normal/google3857/{zoom}/{y}/{x}.jpeg",
-            "polygon": [
-                [
-                    [
-                        16.5073284,
-                        46.9929304
+                        -90.3677669,
+                        47.6844827
                     ],
                     [
-                        16.283417,
-                        46.9929304
+                        -90.3069978,
+                        47.6844827
                     ],
                     [
-                        16.135839,
-                        46.8713046
+                        -90.3069978,
+                        47.7460174
                     ],
                     [
-                        15.9831722,
-                        46.8190947
+                        -89.994859,
+                        47.7460174
                     ],
                     [
-                        16.0493278,
-                        46.655175
+                        -89.994859,
+                        47.8082719
                     ],
                     [
-                        15.8610387,
-                        46.7180116
+                        -89.8048615,
+                        47.8082719
                     ],
                     [
-                        15.7592608,
-                        46.6900933
+                        -89.8048615,
+                        47.8700562
                     ],
                     [
-                        15.5607938,
-                        46.6796202
+                        -89.6797699,
+                        47.8700562
                     ],
                     [
-                        15.5760605,
-                        46.6342132
+                        -89.6797699,
+                        47.9339637
                     ],
                     [
-                        15.4793715,
-                        46.6027553
+                        -89.4933757,
+                        47.9339637
                     ],
                     [
-                        15.4335715,
-                        46.6516819
+                        -89.4933757,
+                        47.9957956
                     ],
                     [
-                        15.2249267,
-                        46.6342132
+                        -89.4284697,
+                        47.9957956
                     ],
                     [
-                        15.0468154,
-                        46.6481886
+                        -89.4284697,
+                        48.0656377
                     ],
                     [
-                        14.9908376,
-                        46.5887681
+                        -89.9932739,
+                        48.0656377
                     ],
                     [
-                        14.9603042,
-                        46.6237293
+                        -89.9932739,
+                        48.1282966
                     ],
                     [
-                        14.8534374,
-                        46.6027553
+                        -90.7455933,
+                        48.1282966
                     ],
                     [
-                        14.8330818,
-                        46.5012666
+                        -90.7455933,
+                        48.1893056
                     ],
                     [
-                        14.7516595,
-                        46.4977636
+                        -90.8087291,
+                        48.1893056
                     ],
                     [
-                        14.6804149,
-                        46.4381781
+                        -90.8087291,
+                        48.2522065
                     ],
                     [
-                        14.6142593,
-                        46.4381781
+                        -91.067763,
+                        48.2522065
                     ],
                     [
-                        14.578637,
-                        46.3785275
+                        -91.067763,
+                        48.1916658
                     ],
                     [
-                        14.4412369,
-                        46.4311638
+                        -91.1946247,
+                        48.1916658
                     ],
                     [
-                        14.1613476,
-                        46.4276563
+                        -91.1946247,
+                        48.1279027
                     ],
                     [
-                        14.1257253,
-                        46.4767409
+                        -91.6814196,
+                        48.1279027
                     ],
                     [
-                        14.0188585,
-                        46.4767409
+                        -91.6814196,
+                        48.2525994
                     ],
                     [
-                        13.9119917,
-                        46.5257813
+                        -91.9321927,
+                        48.2525994
                     ],
                     [
-                        13.8254805,
-                        46.5047694
+                        -91.9321927,
+                        48.3142454
                     ],
                     [
-                        13.4438134,
-                        46.560783
+                        -91.9929683,
+                        48.3142454
                     ],
                     [
-                        13.3064132,
-                        46.5502848
+                        -91.9929683,
+                        48.3780845
                     ],
                     [
-                        13.1283019,
-                        46.5887681
+                        -92.3189383,
+                        48.3780845
                     ],
                     [
-                        12.8433237,
-                        46.6132433
+                        -92.3189383,
+                        48.2529081
                     ],
                     [
-                        12.7262791,
-                        46.6412014
+                        -92.3732233,
+                        48.2529081
                     ],
                     [
-                        12.5125455,
-                        46.6656529
+                        -92.3732233,
+                        48.3153385
                     ],
                     [
-                        12.3598787,
-                        46.7040543
+                        -92.4322288,
+                        48.3153385
                     ],
                     [
-                        12.3649676,
-                        46.7703197
+                        -92.4322288,
+                        48.4411448
                     ],
                     [
-                        12.2886341,
-                        46.7772902
+                        -92.4977248,
+                        48.4411448
                     ],
                     [
-                        12.2733674,
-                        46.8852187
+                        -92.4977248,
+                        48.501781
                     ],
                     [
-                        12.2072118,
-                        46.8747835
+                        -92.5679413,
+                        48.501781
                     ],
                     [
-                        12.1308784,
-                        46.9026062
+                        -92.5679413,
+                        48.439579
                     ],
                     [
-                        12.1156117,
-                        46.9998721
+                        -92.6210462,
+                        48.439579
                     ],
                     [
-                        12.2530119,
-                        47.0657733
+                        -92.6210462,
+                        48.5650783
                     ],
                     [
-                        12.2123007,
-                        47.0934969
+                        -92.8086835,
+                        48.5650783
                     ],
                     [
-                        11.9833004,
-                        47.0449712
+                        -92.8086835,
+                        48.6286865
                     ],
                     [
-                        11.7339445,
-                        46.9616816
+                        -92.8086835,
+                        48.6267365
                     ],
                     [
-                        11.6321666,
-                        47.010283
+                        -92.933185,
+                        48.6267365
                     ],
                     [
-                        11.5405665,
-                        46.9755722
+                        -92.933185,
+                        48.6922145
                     ],
                     [
-                        11.4998553,
-                        47.0068129
+                        -93.0051716,
+                        48.6922145
                     ],
                     [
-                        11.418433,
-                        46.9651546
+                        -93.0051716,
+                        48.6282965
                     ],
                     [
-                        11.2555884,
-                        46.9755722
+                        -93.1225924,
+                        48.6282965
                     ],
                     [
-                        11.1130993,
-                        46.913036
+                        -93.1225924,
+                        48.6922145
                     ],
                     [
-                        11.0418548,
-                        46.7633482
+                        -93.3190806,
+                        48.6922145
                     ],
                     [
-                        10.8891879,
-                        46.7598621
+                        -93.3190806,
+                        48.6267365
                     ],
                     [
-                        10.7416099,
-                        46.7842599
+                        -93.5049477,
+                        48.6267365
                     ],
                     [
-                        10.7059877,
-                        46.8643462
+                        -93.5049477,
+                        48.5635164
                     ],
                     [
-                        10.5787653,
-                        46.8399847
+                        -93.7474601,
+                        48.5635164
                     ],
                     [
-                        10.4566318,
-                        46.8504267
+                        -93.7474601,
+                        48.6267365
                     ],
                     [
-                        10.4769874,
-                        46.9269392
+                        -93.8135461,
+                        48.6267365
                     ],
                     [
-                        10.3853873,
-                        46.9894592
+                        -93.8135461,
+                        48.6898775
                     ],
                     [
-                        10.2327204,
-                        46.8643462
+                        -94.2453121,
+                        48.6898775
                     ],
                     [
-                        10.1207647,
-                        46.8330223
+                        -94.2453121,
+                        48.7554327
                     ],
                     [
-                        9.8663199,
-                        46.9408389
+                        -94.6183171,
+                        48.7554327
                     ],
                     [
-                        9.9019422,
-                        47.0033426
+                        -94.6183171,
+                        48.941036
                     ],
                     [
-                        9.6831197,
-                        47.0588402
+                        -94.6809018,
+                        48.941036
                     ],
                     [
-                        9.6118752,
-                        47.0380354
+                        -94.6809018,
+                        49.0029737
                     ],
                     [
-                        9.6322307,
-                        47.128131
+                        -94.7441532,
+                        49.0029737
                     ],
                     [
-                        9.5813418,
-                        47.1662025
+                        -94.7441532,
+                        49.2536079
                     ],
                     [
-                        9.5406306,
-                        47.2664422
+                        -94.8084069,
+                        49.2536079
                     ],
                     [
-                        9.6067863,
-                        47.3492559
+                        -94.8084069,
+                        49.3784134
                     ],
                     [
-                        9.6729419,
-                        47.369939
+                        -95.1192391,
+                        49.3784134
                     ],
                     [
-                        9.6424085,
-                        47.4457079
+                        -95.1192391,
+                        49.4425264
                     ],
                     [
-                        9.5660751,
-                        47.4801122
+                        -95.1934341,
+                        49.4425264
                     ],
                     [
-                        9.7136531,
-                        47.5282405
+                        -95.1934341,
+                        49.0035292
                     ],
                     [
-                        9.7848976,
-                        47.5969187
+                        -96.87069,
+                        49.0035292
                     ],
                     [
-                        9.8357866,
-                        47.5454185
+                        -96.87069,
+                        49.0656063
                     ],
                     [
-                        9.9477423,
-                        47.538548
+                        -99.0049312,
+                        49.0656063
                     ],
                     [
-                        10.0902313,
-                        47.4491493
+                        -99.0049312,
+                        49.0050714
                     ],
                     [
-                        10.1105869,
-                        47.3664924
+                        -109.3699257,
+                        49.0050714
                     ],
                     [
-                        10.2428982,
-                        47.3871688
+                        -109.3699257,
+                        49.0668231
                     ],
                     [
-                        10.1869203,
-                        47.2698953
+                        -109.5058746,
+                        49.0668231
                     ],
                     [
-                        10.3243205,
-                        47.2975125
+                        -109.5058746,
+                        49.0050714
                     ],
                     [
-                        10.4820763,
-                        47.4491493
+                        -114.1830014,
+                        49.0050714
                     ],
                     [
-                        10.4311873,
-                        47.4869904
+                        -114.1830014,
+                        49.0687317
                     ],
                     [
-                        10.4413651,
-                        47.5900549
+                        -114.7578709,
+                        49.0687317
                     ],
                     [
-                        10.4871652,
-                        47.5522881
+                        -114.7578709,
+                        49.0050714
                     ],
                     [
-                        10.5482319,
-                        47.5351124
+                        -115.433731,
+                        49.0050714
                     ],
                     [
-                        10.5991209,
-                        47.5660246
+                        -115.433731,
+                        49.0671412
                     ],
                     [
-                        10.7568766,
-                        47.5316766
+                        -116.5062706,
+                        49.0671412
                     ],
                     [
-                        10.8891879,
-                        47.5454185
+                        -116.5062706,
+                        49.0050714
                     ],
                     [
-                        10.9400769,
-                        47.4869904
+                        -117.3089504,
+                        49.0050714
                     ],
                     [
-                        10.9960547,
-                        47.3906141
+                        -117.3089504,
+                        49.0659803
                     ],
                     [
-                        11.2352328,
-                        47.4422662
+                        -119.882945,
+                        49.0659803
                     ],
                     [
-                        11.2810328,
-                        47.3975039
+                        -119.882945,
+                        49.0050714
                     ],
                     [
-                        11.4235219,
-                        47.5144941
+                        -120.1208555,
+                        49.0050714
                     ],
                     [
-                        11.5761888,
-                        47.5076195
+                        -120.1208555,
+                        49.0678367
                     ],
                     [
-                        11.6067221,
-                        47.5900549
+                        -121.4451636,
+                        49.0678367
                     ],
                     [
-                        11.8357224,
-                        47.5866227
+                        -121.4451636,
+                        49.0050714
                     ],
                     [
-                        12.003656,
-                        47.6243647
+                        -121.9311808,
+                        49.0050714
                     ],
                     [
-                        12.2072118,
-                        47.6037815
+                        -121.9311808,
+                        49.0656099
                     ],
                     [
-                        12.1614117,
-                        47.6963421
+                        -122.817484,
+                        49.0656099
                     ],
                     [
-                        12.2581008,
-                        47.7442718
+                        -122.817484,
+                        49.0029143
                     ],
                     [
-                        12.2530119,
-                        47.6792136
+                        -122.8795155,
+                        49.0029143
                     ],
                     [
-                        12.4311232,
-                        47.7100408
+                        -122.8795155,
+                        48.9347018
                     ],
                     [
-                        12.4921899,
-                        47.631224
+                        -122.8174629,
+                        48.9347018
                     ],
                     [
-                        12.5685234,
-                        47.6277944
+                        -122.8174629,
+                        48.8101998
                     ],
                     [
-                        12.6295901,
-                        47.6894913
+                        -122.7538859,
+                        48.8101998
                     ],
                     [
-                        12.7720792,
-                        47.6689338
+                        -122.7538859,
+                        48.7533758
                     ],
                     [
-                        12.8331459,
-                        47.5419833
+                        -122.8712937,
+                        48.7533758
                     ],
                     [
-                        12.975635,
-                        47.4732332
+                        -122.8712937,
+                        48.8153948
                     ],
                     [
-                        13.0417906,
-                        47.4938677
+                        -123.0055391,
+                        48.8153948
                     ],
                     [
-                        13.0367017,
-                        47.5557226
+                        -123.0055391,
+                        48.7529529
                     ],
                     [
-                        13.0977685,
-                        47.6415112
+                        -123.1296926,
+                        48.7529529
                     ],
                     [
-                        13.0316128,
-                        47.7100408
+                        -123.1296926,
+                        48.6902201
                     ],
                     [
-                        12.9043905,
-                        47.7203125
+                        -123.1838197,
+                        48.6902201
                     ],
                     [
-                        13.0061684,
-                        47.84683
+                        -123.1838197,
+                        48.7529029
+                    ]
+                ],
+                [
+                    [
+                        -122.9341743,
+                        37.7521547
                     ],
                     [
-                        12.9451016,
-                        47.9355501
+                        -122.9347457,
+                        37.6842013
                     ],
                     [
-                        12.8636793,
-                        47.9594103
+                        -123.0679013,
+                        37.6849023
                     ],
                     [
-                        12.8636793,
-                        48.0036929
+                        -123.0673747,
+                        37.7475251
                     ],
                     [
-                        12.7517236,
-                        48.0989418
+                        -123.1292603,
+                        37.7478506
                     ],
                     [
-                        12.8738571,
-                        48.2109733
+                        -123.1286894,
+                        37.815685
                     ],
                     [
-                        12.9603683,
-                        48.2109733
+                        -123.0590687,
+                        37.8153192
                     ],
                     [
-                        13.0417906,
-                        48.2652035
+                        -123.0595947,
+                        37.7528143
+                    ]
+                ],
+                [
+                    [
+                        -71.6299464,
+                        41.2540893
                     ],
                     [
-                        13.1842797,
-                        48.2990682
+                        -71.4966465,
+                        41.2541393
                     ],
                     [
-                        13.2606131,
-                        48.2922971
+                        -71.4965596,
+                        41.122965
                     ],
                     [
-                        13.3980133,
-                        48.3565867
+                        -71.6298594,
+                        41.1229149
+                    ]
+                ],
+                [
+                    [
+                        -70.3184265,
+                        41.3775196
                     ],
                     [
-                        13.4438134,
-                        48.417418
+                        -70.3183384,
+                        41.2448243
                     ],
                     [
-                        13.4387245,
-                        48.5523383
+                        -70.1906612,
+                        41.2448722
                     ],
                     [
-                        13.509969,
-                        48.5860123
+                        -70.1906239,
+                        41.1886019
                     ],
                     [
-                        13.6117469,
-                        48.5725454
+                        -69.9336025,
+                        41.1886984
                     ],
                     [
-                        13.7287915,
-                        48.5118999
+                        -69.933729,
+                        41.3791941
                     ],
                     [
-                        13.7847694,
-                        48.5725454
+                        -69.9950664,
+                        41.3791712
                     ],
                     [
-                        13.8203916,
-                        48.6263915
+                        -69.995109,
+                        41.443159
                     ],
                     [
-                        13.7949471,
-                        48.7171267
+                        -70.0707828,
+                        41.4431307
                     ],
                     [
-                        13.850925,
-                        48.7741724
+                        -70.0706972,
+                        41.3144915
                     ],
                     [
-                        14.0595697,
-                        48.6633774
+                        -70.2461667,
+                        41.3144258
                     ],
                     [
-                        14.0137696,
-                        48.6331182
+                        -70.2462087,
+                        41.3775467
+                    ]
+                ],
+                [
+                    [
+                        -68.9403374,
+                        43.9404062
                     ],
                     [
-                        14.0748364,
-                        48.5927444
+                        -68.6856948,
+                        43.9404977
                     ],
                     [
-                        14.2173255,
-                        48.5961101
+                        -68.6856475,
+                        43.8721797
                     ],
                     [
-                        14.3649034,
-                        48.5489696
+                        -68.7465405,
+                        43.8721577
                     ],
                     [
-                        14.4666813,
-                        48.6499311
+                        -68.7464976,
+                        43.8102529
                     ],
                     [
-                        14.5582815,
-                        48.5961101
+                        -68.8090782,
+                        43.8102304
                     ],
                     [
-                        14.5989926,
-                        48.6263915
+                        -68.8090343,
+                        43.746728
                     ],
                     [
-                        14.7211261,
-                        48.5759124
+                        -68.8773094,
+                        43.7467034
                     ],
                     [
-                        14.7211261,
-                        48.6868997
+                        -68.8773544,
+                        43.8117826
                     ],
                     [
-                        14.822904,
-                        48.7271983
+                        -68.9402483,
+                        43.8117599
+                    ]
+                ],
+                [
+                    [
+                        -123.1291466,
+                        49.0645144
                     ],
                     [
-                        14.8178151,
-                        48.777526
+                        -122.9954224,
+                        49.0645144
                     ],
                     [
-                        14.9647227,
-                        48.7851754
+                        -122.9954224,
+                        48.9343243
                     ],
                     [
-                        14.9893637,
-                        49.0126611
+                        -123.1291466,
+                        48.9343243
+                    ]
+                ],
+                [
+                    [
+                        -82.9407144,
+                        24.7535913
                     ],
                     [
-                        15.1485933,
-                        48.9950306
+                        -82.8719398,
+                        24.7535913
                     ],
                     [
-                        15.1943934,
-                        48.9315502
+                        -82.8719398,
+                        24.6905653
                     ],
                     [
-                        15.3063491,
-                        48.9850128
+                        -82.7446233,
+                        24.6905653
                     ],
                     [
-                        15.3928603,
-                        48.9850128
+                        -82.7446233,
+                        24.6214593
                     ],
                     [
-                        15.4844604,
-                        48.9282069
+                        -82.8088038,
+                        24.6214593
                     ],
                     [
-                        15.749083,
-                        48.8545973
+                        -82.8088038,
+                        24.5594908
                     ],
                     [
-                        15.8406831,
-                        48.8880697
+                        -82.9407144,
+                        24.5594908
+                    ]
+                ]
+            ]
+        },
+        {
+            "name": "USGS Topographic Maps",
+            "type": "tms",
+            "template": "http://{switch:a,b,c}.tile.openstreetmap.us/usgs_scanned_topos/{zoom}/{x}/{y}.png",
+            "polygon": [
+                [
+                    [
+                        -125.990173,
+                        48.9962416
                     ],
                     [
-                        16.0086166,
-                        48.7808794
+                        -125.989419,
+                        47.9948396
                     ],
                     [
-                        16.2070835,
-                        48.7339115
+                        -123.9929739,
+                        47.9955062
                     ],
                     [
-                        16.3953727,
-                        48.7372678
+                        -123.9922429,
+                        47.0059202
                     ],
                     [
-                        16.4920617,
-                        48.8110498
+                        -125.988688,
+                        47.0052409
                     ],
                     [
-                        16.6905286,
-                        48.7741724
+                        -125.9879604,
+                        46.0015618
                     ],
                     [
-                        16.7057953,
-                        48.7339115
+                        -123.9939396,
+                        46.0022529
                     ],
                     [
-                        16.8991733,
-                        48.713769
+                        -123.9925238,
+                        43.9961708
                     ],
                     [
-                        16.9755067,
-                        48.515271
+                        -124.9931832,
+                        43.9958116
                     ],
                     [
-                        16.8482844,
-                        48.4511817
+                        -124.9918175,
+                        41.9942149
                     ],
                     [
-                        16.8533733,
-                        48.3464411
+                        -125.9851789,
+                        41.9938465
                     ],
                     [
-                        16.9551512,
-                        48.2516513
+                        -125.9838655,
+                        40.0076111
                     ],
                     [
-                        16.9907734,
-                        48.1498955
+                        -123.9833285,
+                        40.0083757
                     ],
                     [
-                        17.0925513,
-                        48.1397088
+                        -123.9814115,
+                        37.002615
                     ],
                     [
-                        17.0823736,
-                        48.0241182
+                        -122.21903,
+                        37.0033173
                     ],
                     [
-                        17.1739737,
-                        48.0207146
+                        -122.2184144,
+                        36.011671
                     ],
                     [
-                        17.0823736,
-                        47.8741447
+                        -122.020087,
+                        36.011751
                     ],
                     [
-                        16.9856845,
-                        47.8673174
+                        -122.0188591,
+                        33.9961766
                     ],
                     [
-                        17.0823736,
-                        47.8092489
+                        -119.9787757,
+                        33.9970206
                     ],
                     [
-                        17.0925513,
-                        47.7031919
+                        -119.9775867,
+                        31.9987658
                     ],
                     [
-                        16.7414176,
-                        47.6792136
+                        -114.0122833,
+                        32.00129
                     ],
                     [
-                        16.7057953,
-                        47.7511153
+                        -114.0116894,
+                        30.9862401
                     ],
                     [
-                        16.5378617,
-                        47.7545368
+                        -105.998294,
+                        30.9896679
                     ],
                     [
-                        16.5480395,
-                        47.7066164
+                        -105.9971419,
+                        28.9901065
                     ],
                     [
-                        16.4208172,
-                        47.6689338
+                        -102.0210506,
+                        28.9918418
                     ],
                     [
-                        16.573484,
-                        47.6175045
+                        -102.0204916,
+                        28.00733
                     ],
                     [
-                        16.670173,
-                        47.631224
+                        -100.0062436,
+                        28.0082173
                     ],
                     [
-                        16.7108842,
-                        47.538548
+                        -100.0051143,
+                        25.991909
                     ],
                     [
-                        16.6599952,
-                        47.4491493
+                        -98.0109067,
+                        25.9928035
                     ],
                     [
-                        16.5429506,
-                        47.3940591
+                        -98.0103613,
+                        25.0063461
                     ],
                     [
-                        16.4615283,
-                        47.3940591
+                        -97.0161086,
+                        25.0067957
                     ],
                     [
-                        16.4920617,
-                        47.276801
+                        -97.016654,
+                        25.9932494
                     ],
                     [
-                        16.425906,
-                        47.1973317
+                        -95.9824825,
+                        25.9937132
                     ],
                     [
-                        16.4717061,
-                        47.1489007
+                        -95.9835999,
+                        27.9891175
                     ],
                     [
-                        16.5480395,
-                        47.1489007
+                        -94.0200898,
+                        27.9899826
                     ],
                     [
-                        16.476795,
-                        47.0796369
+                        -94.0206586,
+                        28.9918129
                     ],
                     [
-                        16.527684,
-                        47.0588402
-                    ]
-                ]
-            ],
-            "terms_text": "basemap.at",
-            "id": "basemap.at"
-        }
-    ],
-    "wikipedia": [
-        [
-            "English",
-            "English",
-            "en"
-        ],
-        [
-            "German",
-            "Deutsch",
-            "de"
-        ],
-        [
-            "Dutch",
-            "Nederlands",
-            "nl"
-        ],
-        [
-            "French",
-            "Français",
-            "fr"
-        ],
-        [
-            "Italian",
-            "Italiano",
-            "it"
-        ],
-        [
-            "Russian",
-            "Русский",
-            "ru"
-        ],
-        [
-            "Spanish",
-            "Español",
-            "es"
-        ],
-        [
-            "Polish",
-            "Polski",
-            "pl"
-        ],
-        [
-            "Swedish",
-            "Svenska",
-            "sv"
-        ],
-        [
-            "Japanese",
-            "日本語",
-            "ja"
-        ],
-        [
-            "Portuguese",
-            "Português",
-            "pt"
-        ],
-        [
-            "Chinese",
-            "中文",
-            "zh"
-        ],
-        [
-            "Vietnamese",
-            "Tiếng Việt",
-            "vi"
-        ],
-        [
-            "Ukrainian",
-            "Українська",
-            "uk"
-        ],
-        [
-            "Catalan",
-            "Català",
-            "ca"
-        ],
-        [
-            "Norwegian (Bokmål)",
-            "Norsk (Bokmål)",
-            "no"
-        ],
-        [
-            "Waray-Waray",
-            "Winaray",
-            "war"
-        ],
-        [
-            "Cebuano",
-            "Sinugboanong Binisaya",
-            "ceb"
-        ],
-        [
-            "Finnish",
-            "Suomi",
+                        -88.0156706,
+                        28.9944338
+                    ],
+                    [
+                        -88.0162494,
+                        30.0038862
+                    ],
+                    [
+                        -86.0277506,
+                        30.0047454
+                    ],
+                    [
+                        -86.0271719,
+                        28.9953016
+                    ],
+                    [
+                        -84.0187909,
+                        28.9961781
+                    ],
+                    [
+                        -84.017095,
+                        25.9817708
+                    ],
+                    [
+                        -81.9971976,
+                        25.9826768
+                    ],
+                    [
+                        -81.9966618,
+                        25.0134917
+                    ],
+                    [
+                        -84.0165592,
+                        25.0125783
+                    ],
+                    [
+                        -84.0160068,
+                        24.0052745
+                    ],
+                    [
+                        -80.0199985,
+                        24.007096
+                    ],
+                    [
+                        -80.0245309,
+                        32.0161282
+                    ],
+                    [
+                        -78.0066484,
+                        32.0169819
+                    ],
+                    [
+                        -78.0072238,
+                        32.9894278
+                    ],
+                    [
+                        -77.8807233,
+                        32.9894807
+                    ],
+                    [
+                        -77.8813253,
+                        33.9955918
+                    ],
+                    [
+                        -76.0115411,
+                        33.9963653
+                    ],
+                    [
+                        -76.0121459,
+                        34.9952552
+                    ],
+                    [
+                        -74.0068449,
+                        34.9960749
+                    ],
+                    [
+                        -74.0099997,
+                        40.0084254
+                    ],
+                    [
+                        -72.0013745,
+                        40.0091931
+                    ],
+                    [
+                        -72.002019,
+                        40.9912464
+                    ],
+                    [
+                        -69.8797398,
+                        40.9920457
+                    ],
+                    [
+                        -69.8804173,
+                        42.00893
+                    ],
+                    [
+                        -69.9927682,
+                        42.0088883
+                    ],
+                    [
+                        -69.9934462,
+                        43.0105166
+                    ],
+                    [
+                        -67.9845366,
+                        43.0112496
+                    ],
+                    [
+                        -67.985224,
+                        44.0103812
+                    ],
+                    [
+                        -65.9892568,
+                        44.0110975
+                    ],
+                    [
+                        -65.9921237,
+                        47.9993584
+                    ],
+                    [
+                        -70.006442,
+                        47.9980181
+                    ],
+                    [
+                        -70.005708,
+                        47.0042007
+                    ],
+                    [
+                        -72.023686,
+                        47.003514
+                    ],
+                    [
+                        -72.0222508,
+                        45.0059846
+                    ],
+                    [
+                        -78.0146667,
+                        45.0038705
+                    ],
+                    [
+                        -78.0139662,
+                        44.0026998
+                    ],
+                    [
+                        -80.029686,
+                        44.0019763
+                    ],
+                    [
+                        -80.0290052,
+                        43.0122994
+                    ],
+                    [
+                        -81.995479,
+                        43.011582
+                    ],
+                    [
+                        -81.9982986,
+                        47.0042713
+                    ],
+                    [
+                        -87.505706,
+                        47.0023972
+                    ],
+                    [
+                        -87.5064535,
+                        48.0142702
+                    ],
+                    [
+                        -88.0260889,
+                        48.0140968
+                    ],
+                    [
+                        -88.026838,
+                        49.0086686
+                    ],
+                    [
+                        -93.9981078,
+                        49.0067142
+                    ],
+                    [
+                        -93.9988778,
+                        50.0086456
+                    ],
+                    [
+                        -96.0138899,
+                        50.0079995
+                    ],
+                    [
+                        -96.0131199,
+                        49.0060547
+                    ]
+                ],
+                [
+                    [
+                        -160.5787616,
+                        22.5062947
+                    ],
+                    [
+                        -160.5782192,
+                        21.4984647
+                    ],
+                    [
+                        -159.0030121,
+                        21.499196
+                    ],
+                    [
+                        -159.0027422,
+                        20.9951068
+                    ],
+                    [
+                        -157.5083185,
+                        20.995803
+                    ],
+                    [
+                        -157.5080519,
+                        20.4960241
+                    ],
+                    [
+                        -155.966889,
+                        20.4967444
+                    ],
+                    [
+                        -155.9674267,
+                        21.5028287
+                    ],
+                    [
+                        -157.5044717,
+                        21.5021151
+                    ],
+                    [
+                        -157.5047384,
+                        21.9984962
+                    ],
+                    [
+                        -159.0090946,
+                        21.9978002
+                    ],
+                    [
+                        -159.0093692,
+                        22.5070181
+                    ]
+                ],
+                [
+                    [
+                        -168.006102,
+                        68.9941463
+                    ],
+                    [
+                        -168.0047628,
+                        68.0107853
+                    ],
+                    [
+                        -165.4842481,
+                        68.0112562
+                    ],
+                    [
+                        -165.4829337,
+                        67.0037303
+                    ],
+                    [
+                        -168.0034485,
+                        67.0032389
+                    ],
+                    [
+                        -168.002195,
+                        66.0017503
+                    ],
+                    [
+                        -169.0087448,
+                        66.001546
+                    ],
+                    [
+                        -169.0075381,
+                        64.9987675
+                    ],
+                    [
+                        -168.0009882,
+                        64.9989798
+                    ],
+                    [
+                        -167.9998282,
+                        63.9982374
+                    ],
+                    [
+                        -164.9871288,
+                        63.9988964
+                    ],
+                    [
+                        -164.9860062,
+                        62.9950845
+                    ],
+                    [
+                        -167.9987057,
+                        62.9944019
+                    ],
+                    [
+                        -167.9946035,
+                        59.0153692
+                    ],
+                    [
+                        -162.5027857,
+                        59.0167799
+                    ],
+                    [
+                        -162.5018149,
+                        58.0005815
+                    ],
+                    [
+                        -160.0159024,
+                        58.0012389
+                    ],
+                    [
+                        -160.0149725,
+                        57.000035
+                    ],
+                    [
+                        -160.5054788,
+                        56.9999017
+                    ],
+                    [
+                        -160.5045719,
+                        55.9968161
+                    ],
+                    [
+                        -164.012195,
+                        55.9958373
+                    ],
+                    [
+                        -164.0113186,
+                        55.00107
+                    ],
+                    [
+                        -165.994782,
+                        55.0005023
+                    ],
+                    [
+                        -165.9941266,
+                        54.2400584
+                    ],
+                    [
+                        -168.0002944,
+                        54.2394734
+                    ],
+                    [
+                        -168.0000986,
+                        54.0094921
+                    ],
+                    [
+                        -170.0156134,
+                        54.0089011
+                    ],
+                    [
+                        -170.0147683,
+                        53.0016446
+                    ],
+                    [
+                        -171.9993636,
+                        53.0010487
+                    ],
+                    [
+                        -171.9989488,
+                        52.4977745
+                    ],
+                    [
+                        -176.0083239,
+                        52.4965566
+                    ],
+                    [
+                        -176.0081186,
+                        52.2452555
+                    ],
+                    [
+                        -178.000097,
+                        52.2446469
+                    ],
+                    [
+                        -177.9992996,
+                        51.2554252
+                    ],
+                    [
+                        -176.0073212,
+                        51.2560472
+                    ],
+                    [
+                        -176.0075146,
+                        51.4980163
+                    ],
+                    [
+                        -171.9981395,
+                        51.4992617
+                    ],
+                    [
+                        -171.9985419,
+                        51.9985373
+                    ],
+                    [
+                        -167.9984317,
+                        51.9997661
+                    ],
+                    [
+                        -167.9994645,
+                        53.2560877
+                    ],
+                    [
+                        -165.9932968,
+                        53.2566866
+                    ],
+                    [
+                        -165.9939308,
+                        54.0100804
+                    ],
+                    [
+                        -159.0067205,
+                        54.0121291
+                    ],
+                    [
+                        -159.0075717,
+                        55.002502
+                    ],
+                    [
+                        -158.0190709,
+                        55.0027849
+                    ],
+                    [
+                        -158.0199473,
+                        55.9975094
+                    ],
+                    [
+                        -151.9963213,
+                        55.9991902
+                    ],
+                    [
+                        -151.9981536,
+                        57.9986536
+                    ],
+                    [
+                        -151.500341,
+                        57.9987853
+                    ],
+                    [
+                        -151.5012894,
+                        58.9919816
+                    ],
+                    [
+                        -138.5159989,
+                        58.9953194
+                    ],
+                    [
+                        -138.5150471,
+                        57.9986434
+                    ],
+                    [
+                        -136.6872422,
+                        57.9991267
+                    ],
+                    [
+                        -136.6863158,
+                        57.0016688
+                    ],
+                    [
+                        -135.9973698,
+                        57.001856
+                    ],
+                    [
+                        -135.9964667,
+                        56.0030544
+                    ],
+                    [
+                        -134.6717732,
+                        56.003424
+                    ],
+                    [
+                        -134.6708865,
+                        54.9969623
+                    ],
+                    [
+                        -133.9956734,
+                        54.9971556
+                    ],
+                    [
+                        -133.9948193,
+                        54.0031685
+                    ],
+                    [
+                        -130.0044418,
+                        54.0043387
+                    ],
+                    [
+                        -130.0070826,
+                        57.0000507
+                    ],
+                    [
+                        -131.975877,
+                        56.9995156
+                    ],
+                    [
+                        -131.9787378,
+                        59.9933094
+                    ],
+                    [
+                        -138.0071813,
+                        59.991805
+                    ],
+                    [
+                        -138.0082158,
+                        61.0125755
+                    ],
+                    [
+                        -140.9874011,
+                        61.0118551
+                    ],
+                    [
+                        -140.99984,
+                        71.0039309
+                    ],
+                    [
+                        -154.5023956,
+                        71.0017377
+                    ],
+                    [
+                        -154.5039632,
+                        71.9983391
+                    ],
+                    [
+                        -157.499048,
+                        71.9978773
+                    ],
+                    [
+                        -157.4974758,
+                        70.9982877
+                    ],
+                    [
+                        -163.0233611,
+                        70.9973899
+                    ],
+                    [
+                        -163.0218273,
+                        69.9707435
+                    ],
+                    [
+                        -164.9730896,
+                        69.97041
+                    ],
+                    [
+                        -164.9717003,
+                        68.994689
+                    ]
+                ],
+                [
+                    [
+                        -168.5133204,
+                        62.8689586
+                    ],
+                    [
+                        -168.5144423,
+                        63.8765677
+                    ],
+                    [
+                        -172.0202755,
+                        63.8757975
+                    ],
+                    [
+                        -172.0191536,
+                        62.8681608
+                    ]
+                ],
+                [
+                    [
+                        -170.9947111,
+                        59.9954089
+                    ],
+                    [
+                        -170.995726,
+                        60.9969787
+                    ],
+                    [
+                        -174.0045311,
+                        60.9962508
+                    ],
+                    [
+                        -174.0035162,
+                        59.9946581
+                    ]
+                ],
+                [
+                    [
+                        -156.0717261,
+                        20.2854602
+                    ],
+                    [
+                        -154.7940471,
+                        20.2860582
+                    ],
+                    [
+                        -154.7933145,
+                        18.9029464
+                    ],
+                    [
+                        -156.0709936,
+                        18.9023432
+                    ]
+                ]
+            ]
+        },
+        {
+            "name": "Vejmidte (Denmark)",
+            "type": "tms",
+            "template": "http://{switch:a,b,c}.tile.openstreetmap.dk/danmark/vejmidte/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                0,
+                20
+            ],
+            "polygon": [
+                [
+                    [
+                        8.3743941,
+                        54.9551655
+                    ],
+                    [
+                        8.3683809,
+                        55.4042149
+                    ],
+                    [
+                        8.2103997,
+                        55.4039795
+                    ],
+                    [
+                        8.2087314,
+                        55.4937345
+                    ],
+                    [
+                        8.0502655,
+                        55.4924731
+                    ],
+                    [
+                        8.0185123,
+                        56.7501399
+                    ],
+                    [
+                        8.1819161,
+                        56.7509948
+                    ],
+                    [
+                        8.1763274,
+                        57.0208898
+                    ],
+                    [
+                        8.3413329,
+                        57.0219872
+                    ],
+                    [
+                        8.3392467,
+                        57.1119574
+                    ],
+                    [
+                        8.5054433,
+                        57.1123212
+                    ],
+                    [
+                        8.5033923,
+                        57.2020499
+                    ],
+                    [
+                        9.3316304,
+                        57.2027636
+                    ],
+                    [
+                        9.3319079,
+                        57.2924835
+                    ],
+                    [
+                        9.4978864,
+                        57.2919578
+                    ],
+                    [
+                        9.4988593,
+                        57.3820608
+                    ],
+                    [
+                        9.6649749,
+                        57.3811615
+                    ],
+                    [
+                        9.6687295,
+                        57.5605591
+                    ],
+                    [
+                        9.8351961,
+                        57.5596265
+                    ],
+                    [
+                        9.8374896,
+                        57.6493322
+                    ],
+                    [
+                        10.1725726,
+                        57.6462818
+                    ],
+                    [
+                        10.1754245,
+                        57.7367768
+                    ],
+                    [
+                        10.5118282,
+                        57.7330269
+                    ],
+                    [
+                        10.5152095,
+                        57.8228945
+                    ],
+                    [
+                        10.6834853,
+                        57.8207722
+                    ],
+                    [
+                        10.6751613,
+                        57.6412021
+                    ],
+                    [
+                        10.5077045,
+                        57.6433097
+                    ],
+                    [
+                        10.5039992,
+                        57.5535088
+                    ],
+                    [
+                        10.671038,
+                        57.5514113
+                    ],
+                    [
+                        10.6507805,
+                        57.1024538
+                    ],
+                    [
+                        10.4857673,
+                        57.1045138
+                    ],
+                    [
+                        10.4786236,
+                        56.9249051
+                    ],
+                    [
+                        10.3143981,
+                        56.9267573
+                    ],
+                    [
+                        10.3112341,
+                        56.8369269
+                    ],
+                    [
+                        10.4750295,
+                        56.83509
+                    ],
+                    [
+                        10.4649016,
+                        56.5656681
+                    ],
+                    [
+                        10.9524239,
+                        56.5589761
+                    ],
+                    [
+                        10.9479249,
+                        56.4692243
+                    ],
+                    [
+                        11.1099335,
+                        56.4664675
+                    ],
+                    [
+                        11.1052639,
+                        56.376833
+                    ],
+                    [
+                        10.9429901,
+                        56.3795284
+                    ],
+                    [
+                        10.9341235,
+                        56.1994768
+                    ],
+                    [
+                        10.7719685,
+                        56.2020244
+                    ],
+                    [
+                        10.7694751,
+                        56.1120103
+                    ],
+                    [
+                        10.6079695,
+                        56.1150259
+                    ],
+                    [
+                        10.4466742,
+                        56.116717
+                    ],
+                    [
+                        10.2865948,
+                        56.118675
+                    ],
+                    [
+                        10.2831527,
+                        56.0281851
+                    ],
+                    [
+                        10.4439274,
+                        56.0270388
+                    ],
+                    [
+                        10.4417713,
+                        55.7579243
+                    ],
+                    [
+                        10.4334961,
+                        55.6693533
+                    ],
+                    [
+                        10.743814,
+                        55.6646861
+                    ],
+                    [
+                        10.743814,
+                        55.5712253
+                    ],
+                    [
+                        10.8969041,
+                        55.5712253
+                    ],
+                    [
+                        10.9051793,
+                        55.3953852
+                    ],
+                    [
+                        11.0613726,
+                        55.3812841
+                    ],
+                    [
+                        11.0593038,
+                        55.1124061
+                    ],
+                    [
+                        11.0458567,
+                        55.0318621
+                    ],
+                    [
+                        11.2030844,
+                        55.0247474
+                    ],
+                    [
+                        11.2030844,
+                        55.117139
+                    ],
+                    [
+                        11.0593038,
+                        55.1124061
+                    ],
+                    [
+                        11.0613726,
+                        55.3812841
+                    ],
+                    [
+                        11.0789572,
+                        55.5712253
+                    ],
+                    [
+                        10.8969041,
+                        55.5712253
+                    ],
+                    [
+                        10.9258671,
+                        55.6670198
+                    ],
+                    [
+                        10.743814,
+                        55.6646861
+                    ],
+                    [
+                        10.7562267,
+                        55.7579243
+                    ],
+                    [
+                        10.4417713,
+                        55.7579243
+                    ],
+                    [
+                        10.4439274,
+                        56.0270388
+                    ],
+                    [
+                        10.4466742,
+                        56.116717
+                    ],
+                    [
+                        10.6079695,
+                        56.1150259
+                    ],
+                    [
+                        10.6052053,
+                        56.0247462
+                    ],
+                    [
+                        10.9258671,
+                        56.0201215
+                    ],
+                    [
+                        10.9197132,
+                        55.9309388
+                    ],
+                    [
+                        11.0802782,
+                        55.92792
+                    ],
+                    [
+                        11.0858066,
+                        56.0178284
+                    ],
+                    [
+                        11.7265047,
+                        56.005058
+                    ],
+                    [
+                        11.7319981,
+                        56.0952142
+                    ],
+                    [
+                        12.0540333,
+                        56.0871256
+                    ],
+                    [
+                        12.0608477,
+                        56.1762576
+                    ],
+                    [
+                        12.7023469,
+                        56.1594405
+                    ],
+                    [
+                        12.6611131,
+                        55.7114318
+                    ],
+                    [
+                        12.9792318,
+                        55.7014026
+                    ],
+                    [
+                        12.9612912,
+                        55.5217294
+                    ],
+                    [
+                        12.3268659,
+                        55.5412096
+                    ],
+                    [
+                        12.3206071,
+                        55.4513655
+                    ],
+                    [
+                        12.4778226,
+                        55.447067
+                    ],
+                    [
+                        12.4702432,
+                        55.3570479
+                    ],
+                    [
+                        12.6269738,
+                        55.3523837
+                    ],
+                    [
+                        12.6200898,
+                        55.2632576
+                    ],
+                    [
+                        12.4627339,
+                        55.26722
+                    ],
+                    [
+                        12.4552949,
+                        55.1778223
+                    ],
+                    [
+                        12.2987046,
+                        55.1822303
+                    ],
+                    [
+                        12.2897344,
+                        55.0923641
+                    ],
+                    [
+                        12.6048608,
+                        55.0832904
+                    ],
+                    [
+                        12.5872011,
+                        54.9036285
+                    ],
+                    [
+                        12.2766618,
+                        54.9119031
+                    ],
+                    [
+                        12.2610181,
+                        54.7331602
+                    ],
+                    [
+                        12.1070691,
+                        54.7378161
+                    ],
+                    [
+                        12.0858621,
+                        54.4681655
+                    ],
+                    [
+                        11.7794953,
+                        54.4753579
+                    ],
+                    [
+                        11.7837381,
+                        54.5654783
+                    ],
+                    [
+                        11.1658525,
+                        54.5782155
+                    ],
+                    [
+                        11.1706443,
+                        54.6686508
+                    ],
+                    [
+                        10.8617173,
+                        54.6733956
+                    ],
+                    [
+                        10.8651245,
+                        54.7634667
+                    ],
+                    [
+                        10.7713646,
+                        54.7643888
+                    ],
+                    [
+                        10.7707276,
+                        54.7372807
+                    ],
+                    [
+                        10.7551428,
+                        54.7375776
+                    ],
+                    [
+                        10.7544039,
+                        54.7195666
+                    ],
+                    [
+                        10.7389074,
+                        54.7197588
+                    ],
+                    [
+                        10.7384368,
+                        54.7108482
+                    ],
+                    [
+                        10.7074486,
+                        54.7113045
+                    ],
+                    [
+                        10.7041094,
+                        54.6756741
+                    ],
+                    [
+                        10.5510973,
+                        54.6781698
+                    ],
+                    [
+                        10.5547184,
+                        54.7670245
+                    ],
+                    [
+                        10.2423994,
+                        54.7705935
+                    ],
+                    [
+                        10.2459845,
+                        54.8604673
+                    ],
+                    [
+                        10.0902268,
+                        54.8622134
+                    ],
+                    [
+                        10.0873731,
+                        54.7723851
+                    ],
+                    [
+                        9.1555798,
+                        54.7769557
+                    ],
+                    [
+                        9.1562752,
+                        54.8675369
+                    ],
+                    [
+                        8.5321973,
+                        54.8663765
+                    ],
+                    [
+                        8.531432,
+                        54.95516
+                    ]
+                ],
+                [
+                    [
+                        11.4577738,
+                        56.819554
+                    ],
+                    [
+                        11.7849181,
+                        56.8127385
+                    ],
+                    [
+                        11.7716715,
+                        56.6332796
+                    ],
+                    [
+                        11.4459621,
+                        56.6401087
+                    ]
+                ],
+                [
+                    [
+                        11.3274736,
+                        57.3612962
+                    ],
+                    [
+                        11.3161808,
+                        57.1818004
+                    ],
+                    [
+                        11.1508692,
+                        57.1847276
+                    ],
+                    [
+                        11.1456628,
+                        57.094962
+                    ],
+                    [
+                        10.8157703,
+                        57.1001693
+                    ],
+                    [
+                        10.8290599,
+                        57.3695272
+                    ]
+                ],
+                [
+                    [
+                        11.5843266,
+                        56.2777928
+                    ],
+                    [
+                        11.5782882,
+                        56.1880397
+                    ],
+                    [
+                        11.7392309,
+                        56.1845765
+                    ],
+                    [
+                        11.7456428,
+                        56.2743186
+                    ]
+                ],
+                [
+                    [
+                        14.6825922,
+                        55.3639405
+                    ],
+                    [
+                        14.8395247,
+                        55.3565231
+                    ],
+                    [
+                        14.8263755,
+                        55.2671261
+                    ],
+                    [
+                        15.1393406,
+                        55.2517359
+                    ],
+                    [
+                        15.1532015,
+                        55.3410836
+                    ],
+                    [
+                        15.309925,
+                        55.3330556
+                    ],
+                    [
+                        15.295719,
+                        55.2437356
+                    ],
+                    [
+                        15.1393406,
+                        55.2517359
+                    ],
+                    [
+                        15.1255631,
+                        55.1623802
+                    ],
+                    [
+                        15.2815819,
+                        55.1544167
+                    ],
+                    [
+                        15.2535578,
+                        54.9757646
+                    ],
+                    [
+                        14.6317464,
+                        55.0062496
+                    ]
+                ]
+            ],
+            "terms_url": "http://wiki.openstreetmap.org/wiki/Vejmidte",
+            "terms_text": "Danish municipalities"
+        },
+        {
+            "name": "Vienna: Beschriftungen (annotations)",
+            "type": "tms",
+            "template": "http://www.wien.gv.at/wmts/beschriftung/normal/google3857/{zoom}/{y}/{x}.png",
+            "scaleExtent": [
+                0,
+                19
+            ],
+            "polygon": [
+                [
+                    [
+                        16.17,
+                        48.1
+                    ],
+                    [
+                        16.17,
+                        48.33
+                    ],
+                    [
+                        16.58,
+                        48.33
+                    ],
+                    [
+                        16.58,
+                        48.1
+                    ],
+                    [
+                        16.17,
+                        48.1
+                    ]
+                ]
+            ],
+            "terms_url": "http://data.wien.gv.at/",
+            "terms_text": "Stadt Wien"
+        },
+        {
+            "name": "Vienna: Mehrzweckkarte (general purpose)",
+            "type": "tms",
+            "template": "http://www.wien.gv.at/wmts/fmzk/pastell/google3857/{zoom}/{y}/{x}.jpeg",
+            "scaleExtent": [
+                0,
+                19
+            ],
+            "polygon": [
+                [
+                    [
+                        16.17,
+                        48.1
+                    ],
+                    [
+                        16.17,
+                        48.33
+                    ],
+                    [
+                        16.58,
+                        48.33
+                    ],
+                    [
+                        16.58,
+                        48.1
+                    ],
+                    [
+                        16.17,
+                        48.1
+                    ]
+                ]
+            ],
+            "terms_url": "http://data.wien.gv.at/",
+            "terms_text": "Stadt Wien"
+        },
+        {
+            "name": "Vienna: Orthofoto (aerial image)",
+            "type": "tms",
+            "template": "http://www.wien.gv.at/wmts/lb/farbe/google3857/{zoom}/{y}/{x}.jpeg",
+            "scaleExtent": [
+                0,
+                19
+            ],
+            "polygon": [
+                [
+                    [
+                        16.17,
+                        48.1
+                    ],
+                    [
+                        16.17,
+                        48.33
+                    ],
+                    [
+                        16.58,
+                        48.33
+                    ],
+                    [
+                        16.58,
+                        48.1
+                    ],
+                    [
+                        16.17,
+                        48.1
+                    ]
+                ]
+            ],
+            "terms_url": "http://data.wien.gv.at/",
+            "terms_text": "Stadt Wien"
+        },
+        {
+            "name": "basemap.at",
+            "type": "tms",
+            "description": "Basemap of Austria, based on goverment data.",
+            "template": "http://maps.wien.gv.at/basemap/geolandbasemap/normal/google3857/{zoom}/{y}/{x}.jpeg",
+            "polygon": [
+                [
+                    [
+                        16.5073284,
+                        46.9929304
+                    ],
+                    [
+                        16.283417,
+                        46.9929304
+                    ],
+                    [
+                        16.135839,
+                        46.8713046
+                    ],
+                    [
+                        15.9831722,
+                        46.8190947
+                    ],
+                    [
+                        16.0493278,
+                        46.655175
+                    ],
+                    [
+                        15.8610387,
+                        46.7180116
+                    ],
+                    [
+                        15.7592608,
+                        46.6900933
+                    ],
+                    [
+                        15.5607938,
+                        46.6796202
+                    ],
+                    [
+                        15.5760605,
+                        46.6342132
+                    ],
+                    [
+                        15.4793715,
+                        46.6027553
+                    ],
+                    [
+                        15.4335715,
+                        46.6516819
+                    ],
+                    [
+                        15.2249267,
+                        46.6342132
+                    ],
+                    [
+                        15.0468154,
+                        46.6481886
+                    ],
+                    [
+                        14.9908376,
+                        46.5887681
+                    ],
+                    [
+                        14.9603042,
+                        46.6237293
+                    ],
+                    [
+                        14.8534374,
+                        46.6027553
+                    ],
+                    [
+                        14.8330818,
+                        46.5012666
+                    ],
+                    [
+                        14.7516595,
+                        46.4977636
+                    ],
+                    [
+                        14.6804149,
+                        46.4381781
+                    ],
+                    [
+                        14.6142593,
+                        46.4381781
+                    ],
+                    [
+                        14.578637,
+                        46.3785275
+                    ],
+                    [
+                        14.4412369,
+                        46.4311638
+                    ],
+                    [
+                        14.1613476,
+                        46.4276563
+                    ],
+                    [
+                        14.1257253,
+                        46.4767409
+                    ],
+                    [
+                        14.0188585,
+                        46.4767409
+                    ],
+                    [
+                        13.9119917,
+                        46.5257813
+                    ],
+                    [
+                        13.8254805,
+                        46.5047694
+                    ],
+                    [
+                        13.4438134,
+                        46.560783
+                    ],
+                    [
+                        13.3064132,
+                        46.5502848
+                    ],
+                    [
+                        13.1283019,
+                        46.5887681
+                    ],
+                    [
+                        12.8433237,
+                        46.6132433
+                    ],
+                    [
+                        12.7262791,
+                        46.6412014
+                    ],
+                    [
+                        12.5125455,
+                        46.6656529
+                    ],
+                    [
+                        12.3598787,
+                        46.7040543
+                    ],
+                    [
+                        12.3649676,
+                        46.7703197
+                    ],
+                    [
+                        12.2886341,
+                        46.7772902
+                    ],
+                    [
+                        12.2733674,
+                        46.8852187
+                    ],
+                    [
+                        12.2072118,
+                        46.8747835
+                    ],
+                    [
+                        12.1308784,
+                        46.9026062
+                    ],
+                    [
+                        12.1156117,
+                        46.9998721
+                    ],
+                    [
+                        12.2530119,
+                        47.0657733
+                    ],
+                    [
+                        12.2123007,
+                        47.0934969
+                    ],
+                    [
+                        11.9833004,
+                        47.0449712
+                    ],
+                    [
+                        11.7339445,
+                        46.9616816
+                    ],
+                    [
+                        11.6321666,
+                        47.010283
+                    ],
+                    [
+                        11.5405665,
+                        46.9755722
+                    ],
+                    [
+                        11.4998553,
+                        47.0068129
+                    ],
+                    [
+                        11.418433,
+                        46.9651546
+                    ],
+                    [
+                        11.2555884,
+                        46.9755722
+                    ],
+                    [
+                        11.1130993,
+                        46.913036
+                    ],
+                    [
+                        11.0418548,
+                        46.7633482
+                    ],
+                    [
+                        10.8891879,
+                        46.7598621
+                    ],
+                    [
+                        10.7416099,
+                        46.7842599
+                    ],
+                    [
+                        10.7059877,
+                        46.8643462
+                    ],
+                    [
+                        10.5787653,
+                        46.8399847
+                    ],
+                    [
+                        10.4566318,
+                        46.8504267
+                    ],
+                    [
+                        10.4769874,
+                        46.9269392
+                    ],
+                    [
+                        10.3853873,
+                        46.9894592
+                    ],
+                    [
+                        10.2327204,
+                        46.8643462
+                    ],
+                    [
+                        10.1207647,
+                        46.8330223
+                    ],
+                    [
+                        9.8663199,
+                        46.9408389
+                    ],
+                    [
+                        9.9019422,
+                        47.0033426
+                    ],
+                    [
+                        9.6831197,
+                        47.0588402
+                    ],
+                    [
+                        9.6118752,
+                        47.0380354
+                    ],
+                    [
+                        9.6322307,
+                        47.128131
+                    ],
+                    [
+                        9.5813418,
+                        47.1662025
+                    ],
+                    [
+                        9.5406306,
+                        47.2664422
+                    ],
+                    [
+                        9.6067863,
+                        47.3492559
+                    ],
+                    [
+                        9.6729419,
+                        47.369939
+                    ],
+                    [
+                        9.6424085,
+                        47.4457079
+                    ],
+                    [
+                        9.5660751,
+                        47.4801122
+                    ],
+                    [
+                        9.7136531,
+                        47.5282405
+                    ],
+                    [
+                        9.7848976,
+                        47.5969187
+                    ],
+                    [
+                        9.8357866,
+                        47.5454185
+                    ],
+                    [
+                        9.9477423,
+                        47.538548
+                    ],
+                    [
+                        10.0902313,
+                        47.4491493
+                    ],
+                    [
+                        10.1105869,
+                        47.3664924
+                    ],
+                    [
+                        10.2428982,
+                        47.3871688
+                    ],
+                    [
+                        10.1869203,
+                        47.2698953
+                    ],
+                    [
+                        10.3243205,
+                        47.2975125
+                    ],
+                    [
+                        10.4820763,
+                        47.4491493
+                    ],
+                    [
+                        10.4311873,
+                        47.4869904
+                    ],
+                    [
+                        10.4413651,
+                        47.5900549
+                    ],
+                    [
+                        10.4871652,
+                        47.5522881
+                    ],
+                    [
+                        10.5482319,
+                        47.5351124
+                    ],
+                    [
+                        10.5991209,
+                        47.5660246
+                    ],
+                    [
+                        10.7568766,
+                        47.5316766
+                    ],
+                    [
+                        10.8891879,
+                        47.5454185
+                    ],
+                    [
+                        10.9400769,
+                        47.4869904
+                    ],
+                    [
+                        10.9960547,
+                        47.3906141
+                    ],
+                    [
+                        11.2352328,
+                        47.4422662
+                    ],
+                    [
+                        11.2810328,
+                        47.3975039
+                    ],
+                    [
+                        11.4235219,
+                        47.5144941
+                    ],
+                    [
+                        11.5761888,
+                        47.5076195
+                    ],
+                    [
+                        11.6067221,
+                        47.5900549
+                    ],
+                    [
+                        11.8357224,
+                        47.5866227
+                    ],
+                    [
+                        12.003656,
+                        47.6243647
+                    ],
+                    [
+                        12.2072118,
+                        47.6037815
+                    ],
+                    [
+                        12.1614117,
+                        47.6963421
+                    ],
+                    [
+                        12.2581008,
+                        47.7442718
+                    ],
+                    [
+                        12.2530119,
+                        47.6792136
+                    ],
+                    [
+                        12.4311232,
+                        47.7100408
+                    ],
+                    [
+                        12.4921899,
+                        47.631224
+                    ],
+                    [
+                        12.5685234,
+                        47.6277944
+                    ],
+                    [
+                        12.6295901,
+                        47.6894913
+                    ],
+                    [
+                        12.7720792,
+                        47.6689338
+                    ],
+                    [
+                        12.8331459,
+                        47.5419833
+                    ],
+                    [
+                        12.975635,
+                        47.4732332
+                    ],
+                    [
+                        13.0417906,
+                        47.4938677
+                    ],
+                    [
+                        13.0367017,
+                        47.5557226
+                    ],
+                    [
+                        13.0977685,
+                        47.6415112
+                    ],
+                    [
+                        13.0316128,
+                        47.7100408
+                    ],
+                    [
+                        12.9043905,
+                        47.7203125
+                    ],
+                    [
+                        13.0061684,
+                        47.84683
+                    ],
+                    [
+                        12.9451016,
+                        47.9355501
+                    ],
+                    [
+                        12.8636793,
+                        47.9594103
+                    ],
+                    [
+                        12.8636793,
+                        48.0036929
+                    ],
+                    [
+                        12.7517236,
+                        48.0989418
+                    ],
+                    [
+                        12.8738571,
+                        48.2109733
+                    ],
+                    [
+                        12.9603683,
+                        48.2109733
+                    ],
+                    [
+                        13.0417906,
+                        48.2652035
+                    ],
+                    [
+                        13.1842797,
+                        48.2990682
+                    ],
+                    [
+                        13.2606131,
+                        48.2922971
+                    ],
+                    [
+                        13.3980133,
+                        48.3565867
+                    ],
+                    [
+                        13.4438134,
+                        48.417418
+                    ],
+                    [
+                        13.4387245,
+                        48.5523383
+                    ],
+                    [
+                        13.509969,
+                        48.5860123
+                    ],
+                    [
+                        13.6117469,
+                        48.5725454
+                    ],
+                    [
+                        13.7287915,
+                        48.5118999
+                    ],
+                    [
+                        13.7847694,
+                        48.5725454
+                    ],
+                    [
+                        13.8203916,
+                        48.6263915
+                    ],
+                    [
+                        13.7949471,
+                        48.7171267
+                    ],
+                    [
+                        13.850925,
+                        48.7741724
+                    ],
+                    [
+                        14.0595697,
+                        48.6633774
+                    ],
+                    [
+                        14.0137696,
+                        48.6331182
+                    ],
+                    [
+                        14.0748364,
+                        48.5927444
+                    ],
+                    [
+                        14.2173255,
+                        48.5961101
+                    ],
+                    [
+                        14.3649034,
+                        48.5489696
+                    ],
+                    [
+                        14.4666813,
+                        48.6499311
+                    ],
+                    [
+                        14.5582815,
+                        48.5961101
+                    ],
+                    [
+                        14.5989926,
+                        48.6263915
+                    ],
+                    [
+                        14.7211261,
+                        48.5759124
+                    ],
+                    [
+                        14.7211261,
+                        48.6868997
+                    ],
+                    [
+                        14.822904,
+                        48.7271983
+                    ],
+                    [
+                        14.8178151,
+                        48.777526
+                    ],
+                    [
+                        14.9647227,
+                        48.7851754
+                    ],
+                    [
+                        14.9893637,
+                        49.0126611
+                    ],
+                    [
+                        15.1485933,
+                        48.9950306
+                    ],
+                    [
+                        15.1943934,
+                        48.9315502
+                    ],
+                    [
+                        15.3063491,
+                        48.9850128
+                    ],
+                    [
+                        15.3928603,
+                        48.9850128
+                    ],
+                    [
+                        15.4844604,
+                        48.9282069
+                    ],
+                    [
+                        15.749083,
+                        48.8545973
+                    ],
+                    [
+                        15.8406831,
+                        48.8880697
+                    ],
+                    [
+                        16.0086166,
+                        48.7808794
+                    ],
+                    [
+                        16.2070835,
+                        48.7339115
+                    ],
+                    [
+                        16.3953727,
+                        48.7372678
+                    ],
+                    [
+                        16.4920617,
+                        48.8110498
+                    ],
+                    [
+                        16.6905286,
+                        48.7741724
+                    ],
+                    [
+                        16.7057953,
+                        48.7339115
+                    ],
+                    [
+                        16.8991733,
+                        48.713769
+                    ],
+                    [
+                        16.9755067,
+                        48.515271
+                    ],
+                    [
+                        16.8482844,
+                        48.4511817
+                    ],
+                    [
+                        16.8533733,
+                        48.3464411
+                    ],
+                    [
+                        16.9551512,
+                        48.2516513
+                    ],
+                    [
+                        16.9907734,
+                        48.1498955
+                    ],
+                    [
+                        17.0925513,
+                        48.1397088
+                    ],
+                    [
+                        17.0823736,
+                        48.0241182
+                    ],
+                    [
+                        17.1739737,
+                        48.0207146
+                    ],
+                    [
+                        17.0823736,
+                        47.8741447
+                    ],
+                    [
+                        16.9856845,
+                        47.8673174
+                    ],
+                    [
+                        17.0823736,
+                        47.8092489
+                    ],
+                    [
+                        17.0925513,
+                        47.7031919
+                    ],
+                    [
+                        16.7414176,
+                        47.6792136
+                    ],
+                    [
+                        16.7057953,
+                        47.7511153
+                    ],
+                    [
+                        16.5378617,
+                        47.7545368
+                    ],
+                    [
+                        16.5480395,
+                        47.7066164
+                    ],
+                    [
+                        16.4208172,
+                        47.6689338
+                    ],
+                    [
+                        16.573484,
+                        47.6175045
+                    ],
+                    [
+                        16.670173,
+                        47.631224
+                    ],
+                    [
+                        16.7108842,
+                        47.538548
+                    ],
+                    [
+                        16.6599952,
+                        47.4491493
+                    ],
+                    [
+                        16.5429506,
+                        47.3940591
+                    ],
+                    [
+                        16.4615283,
+                        47.3940591
+                    ],
+                    [
+                        16.4920617,
+                        47.276801
+                    ],
+                    [
+                        16.425906,
+                        47.1973317
+                    ],
+                    [
+                        16.4717061,
+                        47.1489007
+                    ],
+                    [
+                        16.5480395,
+                        47.1489007
+                    ],
+                    [
+                        16.476795,
+                        47.0796369
+                    ],
+                    [
+                        16.527684,
+                        47.0588402
+                    ]
+                ]
+            ],
+            "terms_text": "basemap.at",
+            "id": "basemap.at"
+        }
+    ],
+    "wikipedia": [
+        [
+            "English",
+            "English",
+            "en"
+        ],
+        [
+            "German",
+            "Deutsch",
+            "de"
+        ],
+        [
+            "Dutch",
+            "Nederlands",
+            "nl"
+        ],
+        [
+            "French",
+            "Français",
+            "fr"
+        ],
+        [
+            "Italian",
+            "Italiano",
+            "it"
+        ],
+        [
+            "Russian",
+            "Русский",
+            "ru"
+        ],
+        [
+            "Spanish",
+            "Español",
+            "es"
+        ],
+        [
+            "Polish",
+            "Polski",
+            "pl"
+        ],
+        [
+            "Swedish",
+            "Svenska",
+            "sv"
+        ],
+        [
+            "Japanese",
+            "日本語",
+            "ja"
+        ],
+        [
+            "Portuguese",
+            "Português",
+            "pt"
+        ],
+        [
+            "Chinese",
+            "中文",
+            "zh"
+        ],
+        [
+            "Vietnamese",
+            "Tiếng Việt",
+            "vi"
+        ],
+        [
+            "Ukrainian",
+            "Українська",
+            "uk"
+        ],
+        [
+            "Catalan",
+            "Català",
+            "ca"
+        ],
+        [
+            "Norwegian (Bokmål)",
+            "Norsk (Bokmål)",
+            "no"
+        ],
+        [
+            "Waray-Waray",
+            "Winaray",
+            "war"
+        ],
+        [
+            "Cebuano",
+            "Sinugboanong Binisaya",
+            "ceb"
+        ],
+        [
+            "Finnish",
+            "Suomi",
             "fi"
         ],
         [
@@ -62700,1398 +66597,2509 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "presets": {
             "address": {
                 "fields": [
-                    "address"
+                    "address"
+                ],
+                "geometry": [
+                    "point"
+                ],
+                "tags": {
+                    "addr:housenumber": "*"
+                },
+                "addTags": {},
+                "removeTags": {},
+                "matchScore": 0.2,
+                "name": "Address"
+            },
+            "aerialway": {
+                "fields": [
+                    "aerialway"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "line"
+                ],
+                "tags": {
+                    "aerialway": "*"
+                },
+                "terms": [
+                    "ski lift",
+                    "funifor",
+                    "funitel"
+                ],
+                "name": "Aerialway"
+            },
+            "aerialway/cable_car": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "tramway",
+                    "ropeway"
+                ],
+                "fields": [
+                    "aerialway/occupancy",
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "cable_car"
+                },
+                "name": "Cable Car"
+            },
+            "aerialway/chair_lift": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/occupancy",
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/bubble",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "chair_lift"
+                },
+                "name": "Chair Lift"
+            },
+            "aerialway/gondola": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/occupancy",
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/bubble",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "gondola"
+                },
+                "name": "Gondola"
+            },
+            "aerialway/magic_carpet": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "magic_carpet"
+                },
+                "name": "Magic Carpet Lift"
+            },
+            "aerialway/platter": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "button lift",
+                    "poma lift"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration"
+                ],
+                "tags": {
+                    "aerialway": "platter"
+                },
+                "name": "Platter Lift"
+            },
+            "aerialway/pylon": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "fields": [
+                    "ref"
+                ],
+                "tags": {
+                    "aerialway": "pylon"
+                },
+                "name": "Aerialway Pylon"
+            },
+            "aerialway/rope_tow": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "handle tow",
+                    "bugel lift"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration"
+                ],
+                "tags": {
+                    "aerialway": "rope_tow"
+                },
+                "name": "Rope Tow Lift"
+            },
+            "aerialway/station": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "fields": [
+                    "aerialway/access",
+                    "aerialway/summer/access",
+                    "elevation"
+                ],
+                "tags": {
+                    "aerialway": "station"
+                },
+                "name": "Aerialway Station"
+            },
+            "aerialway/t-bar": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration"
+                ],
+                "tags": {
+                    "aerialway": "t-bar"
+                },
+                "name": "T-bar Lift"
+            },
+            "aeroway": {
+                "icon": "airport",
+                "fields": [
+                    "aeroway"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "line",
+                    "area"
+                ],
+                "tags": {
+                    "aeroway": "*"
+                },
+                "name": "Aeroway"
+            },
+            "aeroway/aerodrome": {
+                "icon": "airport",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "airplane",
+                    "airport",
+                    "aerodrome"
+                ],
+                "fields": [
+                    "ref",
+                    "iata",
+                    "icao",
+                    "operator"
+                ],
+                "tags": {
+                    "aeroway": "aerodrome"
+                },
+                "name": "Airport"
+            },
+            "aeroway/apron": {
+                "icon": "airport",
+                "geometry": [
+                    "area"
+                ],
+                "terms": [
+                    "ramp"
+                ],
+                "fields": [
+                    "ref",
+                    "surface"
+                ],
+                "tags": {
+                    "aeroway": "apron"
+                },
+                "name": "Apron"
+            },
+            "aeroway/gate": {
+                "icon": "airport",
+                "geometry": [
+                    "point"
+                ],
+                "fields": [
+                    "ref"
+                ],
+                "tags": {
+                    "aeroway": "gate"
+                },
+                "name": "Airport gate"
+            },
+            "aeroway/hangar": {
+                "geometry": [
+                    "area"
+                ],
+                "fields": [
+                    "building_area"
+                ],
+                "tags": {
+                    "aeroway": "hangar"
+                },
+                "name": "Hangar"
+            },
+            "aeroway/helipad": {
+                "icon": "heliport",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "helicopter",
+                    "helipad",
+                    "heliport"
+                ],
+                "tags": {
+                    "aeroway": "helipad"
+                },
+                "name": "Helipad"
+            },
+            "aeroway/runway": {
+                "geometry": [
+                    "line",
+                    "area"
+                ],
+                "terms": [
+                    "landing strip"
+                ],
+                "fields": [
+                    "ref",
+                    "surface",
+                    "length",
+                    "width"
+                ],
+                "tags": {
+                    "aeroway": "runway"
+                },
+                "name": "Runway"
+            },
+            "aeroway/taxiway": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "ref",
+                    "surface"
+                ],
+                "tags": {
+                    "aeroway": "taxiway"
+                },
+                "name": "Taxiway"
+            },
+            "aeroway/terminal": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "airport",
+                    "aerodrome"
+                ],
+                "fields": [
+                    "operator",
+                    "building_area"
+                ],
+                "tags": {
+                    "aeroway": "terminal"
+                },
+                "name": "Airport terminal"
+            },
+            "amenity": {
+                "fields": [
+                    "amenity"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "*"
+                },
+                "searchable": false,
+                "name": "Amenity"
+            },
+            "amenity/arts_centre": {
+                "icon": "theatre",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [],
+                "tags": {
+                    "amenity": "arts_centre"
+                },
+                "name": "Arts Center"
+            },
+            "amenity/atm": {
+                "icon": "bank",
+                "fields": [
+                    "operator"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "terms": [
+                    "money",
+                    "cash",
+                    "machine"
+                ],
+                "tags": {
+                    "amenity": "atm"
+                },
+                "name": "ATM"
+            },
+            "amenity/bank": {
+                "icon": "bank",
+                "fields": [
+                    "atm",
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "credit union",
+                    "check",
+                    "deposit",
+                    "fund",
+                    "investment",
+                    "repository",
+                    "reserve",
+                    "safe",
+                    "savings",
+                    "stock",
+                    "treasury",
+                    "trust",
+                    "vault"
+                ],
+                "tags": {
+                    "amenity": "bank"
+                },
+                "name": "Bank"
+            },
+            "amenity/bar": {
+                "icon": "bar",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "smoking"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "dive",
+                    "beer",
+                    "bier",
+                    "booze"
+                ],
+                "tags": {
+                    "amenity": "bar"
+                },
+                "name": "Bar"
+            },
+            "amenity/bbq": {
+                "fields": [
+                    "covered",
+                    "fuel"
+                ],
+                "geometry": [
+                    "point"
+                ],
+                "terms": [
+                    "bbq"
+                ],
+                "tags": {
+                    "amenity": "bbq"
+                },
+                "name": "Barbecue/Grill"
+            },
+            "amenity/bench": {
+                "fields": [
+                    "backrest"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "line"
+                ],
+                "tags": {
+                    "amenity": "bench"
+                },
+                "name": "Bench"
+            },
+            "amenity/bicycle_parking": {
+                "icon": "bicycle",
+                "fields": [
+                    "bicycle_parking",
+                    "capacity",
+                    "operator",
+                    "covered",
+                    "access_simple"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "terms": [
+                    "bike"
+                ],
+                "tags": {
+                    "amenity": "bicycle_parking"
+                },
+                "name": "Bicycle Parking"
+            },
+            "amenity/bicycle_rental": {
+                "icon": "bicycle",
+                "fields": [
+                    "capacity",
+                    "network",
+                    "operator"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "terms": [
+                    "bike"
+                ],
+                "tags": {
+                    "amenity": "bicycle_rental"
+                },
+                "name": "Bicycle Rental"
+            },
+            "amenity/boat_rental": {
+                "fields": [
+                    "operator"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "boat_rental"
+                },
+                "name": "Boat Rental"
+            },
+            "amenity/bureau_de_change": {
+                "icon": "bank",
+                "fields": [
+                    "operator"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "terms": [
+                    "bureau de change",
+                    "money changer"
+                ],
+                "tags": {
+                    "amenity": "bureau_de_change"
+                },
+                "name": "Currency Exchange"
+            },
+            "amenity/bus_station": {
+                "icon": "bus",
+                "fields": [
+                    "building_area",
+                    "operator"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "bus_station"
+                },
+                "name": "Bus Station"
+            },
+            "amenity/cafe": {
+                "icon": "cafe",
+                "fields": [
+                    "cuisine",
+                    "internet_access",
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "smoking"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "coffee",
+                    "tea"
+                ],
+                "tags": {
+                    "amenity": "cafe"
+                },
+                "name": "Cafe"
+            },
+            "amenity/car_rental": {
+                "icon": "car",
+                "fields": [
+                    "operator"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "car_rental"
+                },
+                "name": "Car Rental"
+            },
+            "amenity/car_sharing": {
+                "icon": "car",
+                "fields": [
+                    "operator",
+                    "capacity"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "car_sharing"
+                },
+                "name": "Car Sharing"
+            },
+            "amenity/car_wash": {
+                "icon": "car",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "car_wash"
+                },
+                "name": "Car Wash"
+            },
+            "amenity/charging_station": {
+                "icon": "car",
+                "fields": [
+                    "operator"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "charging_station"
+                },
+                "terms": [
+                    "EV",
+                    "Electric Vehicle",
+                    "Supercharger"
+                ],
+                "name": "Charging Station"
+            },
+            "amenity/childcare": {
+                "icon": "school",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "daycare",
+                    "orphanage",
+                    "playgroup"
+                ],
+                "tags": {
+                    "amenity": "childcare"
+                },
+                "name": "Nursery/Childcare"
+            },
+            "amenity/cinema": {
+                "icon": "cinema",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "drive-in",
+                    "film",
+                    "flick",
+                    "movie",
+                    "theater",
+                    "picture",
+                    "show",
+                    "screen"
+                ],
+                "tags": {
+                    "amenity": "cinema"
+                },
+                "name": "Cinema"
+            },
+            "amenity/clinic": {
+                "icon": "hospital",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "medical",
+                    "urgentcare"
+                ],
+                "tags": {
+                    "amenity": "clinic"
+                },
+                "name": "Clinic"
+            },
+            "amenity/clock": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "amenity": "clock"
+                },
+                "name": "Clock"
+            },
+            "amenity/college": {
+                "icon": "college",
+                "fields": [
+                    "operator",
+                    "address"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "university"
+                ],
+                "tags": {
+                    "amenity": "college"
+                },
+                "name": "College Grounds"
+            },
+            "amenity/community_centre": {
+                "icon": "town-hall",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "event",
+                    "hall"
+                ],
+                "tags": {
+                    "amenity": "community_centre"
+                },
+                "name": "Community Center"
+            },
+            "amenity/compressed_air": {
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "compressed_air"
+                },
+                "name": "Compressed Air"
+            },
+            "amenity/courthouse": {
+                "icon": "town-hall",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "courthouse"
+                },
+                "name": "Courthouse"
+            },
+            "amenity/dentist": {
+                "icon": "hospital",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "tooth",
+                    "teeth"
+                ],
+                "tags": {
+                    "amenity": "dentist"
+                },
+                "name": "Dentist"
+            },
+            "amenity/doctor": {
+                "icon": "hospital",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "medic*"
+                ],
+                "tags": {
+                    "amenity": "doctors"
+                },
+                "name": "Doctor"
+            },
+            "amenity/dojo": {
+                "icon": "pitch",
+                "fields": [
+                    "sport",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "martial arts",
+                    "dojang"
+                ],
+                "tags": {
+                    "amenity": "dojo"
+                },
+                "name": "Dojo / Martial Arts Academy"
+            },
+            "amenity/drinking_water": {
+                "icon": "water",
                 "geometry": [
                     "point"
                 ],
                 "tags": {
-                    "addr:housenumber": "*"
+                    "amenity": "drinking_water"
                 },
-                "addTags": {},
-                "removeTags": {},
-                "matchScore": 0.2,
-                "name": "Address"
+                "terms": [
+                    "fountain",
+                    "potable"
+                ],
+                "name": "Drinking Water"
             },
-            "aerialway": {
+            "amenity/embassy": {
+                "icon": "embassy",
                 "fields": [
-                    "aerialway"
+                    "country",
+                    "address",
+                    "building_area"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "embassy"
+                },
+                "name": "Embassy"
+            },
+            "amenity/fast_food": {
+                "icon": "fast-food",
+                "fields": [
+                    "cuisine",
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "smoking"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "fast_food"
+                },
+                "terms": [
+                    "restaurant"
+                ],
+                "name": "Fast Food"
+            },
+            "amenity/fire_station": {
+                "icon": "fire-station",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [],
+                "tags": {
+                    "amenity": "fire_station"
+                },
+                "name": "Fire Station"
+            },
+            "amenity/fountain": {
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "fountain"
+                },
+                "name": "Fountain"
+            },
+            "amenity/fuel": {
+                "icon": "fuel",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "petrol",
+                    "fuel",
+                    "propane",
+                    "diesel",
+                    "lng",
+                    "cng",
+                    "biodiesel"
+                ],
+                "tags": {
+                    "amenity": "fuel"
+                },
+                "name": "Gas Station"
+            },
+            "amenity/grave_yard": {
+                "icon": "cemetery",
+                "fields": [
+                    "religion",
+                    "denomination"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "grave_yard"
+                },
+                "name": "Graveyard"
+            },
+            "amenity/hospital": {
+                "icon": "hospital",
+                "fields": [
+                    "operator",
+                    "address",
+                    "emergency"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "clinic",
+                    "doctor",
+                    "emergency room",
+                    "health service",
+                    "hospice",
+                    "infirmary",
+                    "institution",
+                    "nursing home",
+                    "sanatorium",
+                    "sanitarium",
+                    "sick",
+                    "surgery",
+                    "ward"
+                ],
+                "tags": {
+                    "amenity": "hospital"
+                },
+                "name": "Hospital Grounds"
+            },
+            "amenity/kindergarten": {
+                "icon": "school",
+                "fields": [
+                    "operator",
+                    "address"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "kindergarden",
+                    "pre-school"
+                ],
+                "tags": {
+                    "amenity": "kindergarten"
+                },
+                "name": "Preschool/Kindergarten Grounds"
+            },
+            "amenity/library": {
+                "icon": "library",
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "book"
+                ],
+                "tags": {
+                    "amenity": "library"
+                },
+                "name": "Library"
+            },
+            "amenity/marketplace": {
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "marketplace"
+                },
+                "name": "Marketplace"
+            },
+            "amenity/nightclub": {
+                "icon": "bar",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "smoking"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "nightclub"
+                },
+                "terms": [
+                    "disco*",
+                    "night club",
+                    "dancing",
+                    "dance club"
+                ],
+                "name": "Nightclub"
+            },
+            "amenity/parking": {
+                "icon": "parking",
+                "fields": [
+                    "operator",
+                    "parking",
+                    "capacity",
+                    "fee",
+                    "access_simple",
+                    "supervised",
+                    "park_ride",
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
-                    "line"
+                    "area"
                 ],
                 "tags": {
-                    "aerialway": "*"
+                    "amenity": "parking"
+                },
+                "terms": [],
+                "name": "Car Parking"
+            },
+            "amenity/parking_entrance": {
+                "icon": "entrance",
+                "fields": [
+                    "access_simple",
+                    "ref"
+                ],
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "amenity": "parking_entrance"
+                },
+                "name": "Parking Garage Entrance/Exit"
+            },
+            "amenity/pharmacy": {
+                "icon": "pharmacy",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "pharmacy"
                 },
                 "terms": [
-                    "ski lift",
-                    "funifor",
-                    "funitel"
+                    "drug",
+                    "medicine"
                 ],
-                "name": "Aerialway"
+                "name": "Pharmacy"
             },
-            "aerialway/cable_car": {
+            "amenity/place_of_worship": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "religion",
+                    "denomination",
+                    "address",
+                    "building_area"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "terms": [
-                    "tramway",
-                    "ropeway"
+                    "abbey",
+                    "basilica",
+                    "bethel",
+                    "cathedral",
+                    "chancel",
+                    "chantry",
+                    "chapel",
+                    "church",
+                    "fold",
+                    "house of God",
+                    "house of prayer",
+                    "house of worship",
+                    "minster",
+                    "mission",
+                    "mosque",
+                    "oratory",
+                    "parish",
+                    "sacellum",
+                    "sanctuary",
+                    "shrine",
+                    "synagogue",
+                    "tabernacle",
+                    "temple"
                 ],
+                "tags": {
+                    "amenity": "place_of_worship"
+                },
+                "name": "Place of Worship"
+            },
+            "amenity/place_of_worship/buddhist": {
+                "icon": "place-of-worship",
                 "fields": [
-                    "aerialway/occupancy",
-                    "aerialway/capacity",
-                    "aerialway/duration",
-                    "aerialway/heating"
+                    "denomination",
+                    "building_area",
+                    "address"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "stupa",
+                    "vihara",
+                    "monastery",
+                    "temple",
+                    "pagoda",
+                    "zendo",
+                    "dojo"
                 ],
                 "tags": {
-                    "aerialway": "cable_car"
+                    "amenity": "place_of_worship",
+                    "religion": "buddhist"
                 },
-                "name": "Cable Car"
+                "name": "Buddhist Temple"
             },
-            "aerialway/chair_lift": {
+            "amenity/place_of_worship/christian": {
+                "icon": "religious-christian",
+                "fields": [
+                    "denomination",
+                    "building_area",
+                    "address"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "christian",
+                    "abbey",
+                    "basilica",
+                    "bethel",
+                    "cathedral",
+                    "chancel",
+                    "chantry",
+                    "chapel",
+                    "fold",
+                    "house of God",
+                    "house of prayer",
+                    "house of worship",
+                    "minster",
+                    "mission",
+                    "oratory",
+                    "parish",
+                    "sacellum",
+                    "sanctuary",
+                    "shrine",
+                    "tabernacle",
+                    "temple"
                 ],
+                "tags": {
+                    "amenity": "place_of_worship",
+                    "religion": "christian"
+                },
+                "name": "Church"
+            },
+            "amenity/place_of_worship/jewish": {
+                "icon": "religious-jewish",
                 "fields": [
-                    "aerialway/occupancy",
-                    "aerialway/capacity",
-                    "aerialway/duration",
-                    "aerialway/bubble",
-                    "aerialway/heating"
+                    "denomination",
+                    "building_area",
+                    "address"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "jewish"
                 ],
                 "tags": {
-                    "aerialway": "chair_lift"
+                    "amenity": "place_of_worship",
+                    "religion": "jewish"
                 },
-                "name": "Chair Lift"
+                "name": "Synagogue"
             },
-            "aerialway/gondola": {
+            "amenity/place_of_worship/muslim": {
+                "icon": "religious-muslim",
+                "fields": [
+                    "denomination",
+                    "building_area",
+                    "address"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
+                "terms": [
+                    "muslim"
+                ],
+                "tags": {
+                    "amenity": "place_of_worship",
+                    "religion": "muslim"
+                },
+                "name": "Mosque"
+            },
+            "amenity/police": {
+                "icon": "police",
                 "fields": [
-                    "aerialway/occupancy",
-                    "aerialway/capacity",
-                    "aerialway/duration",
-                    "aerialway/bubble",
-                    "aerialway/heating"
+                    "operator",
+                    "address",
+                    "building_area"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "badge",
+                    "constable",
+                    "constabulary",
+                    "cop",
+                    "detective",
+                    "fed",
+                    "law",
+                    "enforcement",
+                    "officer",
+                    "patrol"
+                ],
+                "tags": {
+                    "amenity": "police"
+                },
+                "name": "Police"
+            },
+            "amenity/post_box": {
+                "icon": "post",
+                "fields": [
+                    "operator",
+                    "collection_times"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "amenity": "post_box"
+                },
+                "terms": [
+                    "letter",
+                    "post"
+                ],
+                "name": "Mailbox"
+            },
+            "amenity/post_office": {
+                "icon": "post",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "collection_times"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "letter",
+                    "mail"
+                ],
+                "tags": {
+                    "amenity": "post_office"
+                },
+                "name": "Post Office"
+            },
+            "amenity/pub": {
+                "icon": "beer",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "smoking"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "aerialway": "gondola"
+                    "amenity": "pub"
                 },
-                "name": "Gondola"
+                "terms": [
+                    "dive",
+                    "beer",
+                    "bier",
+                    "booze"
+                ],
+                "name": "Pub"
             },
-            "aerialway/magic_carpet": {
+            "amenity/ranger_station": {
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
-                "fields": [
-                    "aerialway/capacity",
-                    "aerialway/duration",
-                    "aerialway/heating"
+                "terms": [
+                    "visitor center",
+                    "visitor centre",
+                    "permit center",
+                    "permit centre",
+                    "backcountry office",
+                    "warden office",
+                    "warden center"
                 ],
                 "tags": {
-                    "aerialway": "magic_carpet"
+                    "amenity": "ranger_station"
                 },
-                "name": "Magic Carpet Lift"
+                "name": "Ranger Station"
             },
-            "aerialway/platter": {
+            "amenity/recycling": {
+                "icon": "recycling",
+                "fields": [
+                    "operator",
+                    "address",
+                    "recycling/cans",
+                    "recycling/glass",
+                    "recycling/paper",
+                    "recycling/clothes"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "terms": [
-                    "button lift",
-                    "poma lift"
-                ],
-                "fields": [
-                    "aerialway/capacity",
-                    "aerialway/duration"
+                    "can",
+                    "bottle",
+                    "garbage",
+                    "scrap",
+                    "trash"
                 ],
                 "tags": {
-                    "aerialway": "platter"
+                    "amenity": "recycling"
                 },
-                "name": "Platter Lift"
+                "name": "Recycling"
             },
-            "aerialway/pylon": {
+            "amenity/restaurant": {
+                "icon": "restaurant",
+                "fields": [
+                    "cuisine",
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "capacity",
+                    "smoking"
+                ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
-                "fields": [
-                    "ref"
+                "terms": [
+                    "bar",
+                    "breakfast",
+                    "cafe",
+                    "café",
+                    "canteen",
+                    "coffee",
+                    "dine",
+                    "dining",
+                    "dinner",
+                    "drive-in",
+                    "eat",
+                    "grill",
+                    "lunch",
+                    "table"
                 ],
                 "tags": {
-                    "aerialway": "pylon"
+                    "amenity": "restaurant"
                 },
-                "name": "Aerialway Pylon"
+                "name": "Restaurant"
             },
-            "aerialway/rope_tow": {
+            "amenity/school": {
+                "icon": "school",
+                "fields": [
+                    "operator",
+                    "address"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "terms": [
-                    "handle tow",
-                    "bugel lift"
-                ],
-                "fields": [
-                    "aerialway/capacity",
-                    "aerialway/duration"
+                    "academy",
+                    "elementary school",
+                    "middle school",
+                    "high school"
                 ],
                 "tags": {
-                    "aerialway": "rope_tow"
+                    "amenity": "school"
                 },
-                "name": "Rope Tow Lift"
+                "name": "School Grounds"
             },
-            "aerialway/station": {
+            "amenity/shelter": {
+                "fields": [
+                    "shelter_type"
+                ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "vertex",
+                    "area"
                 ],
-                "fields": [
-                    "aerialway/access",
-                    "aerialway/summer/access",
-                    "elevation"
+                "terms": [
+                    "lean-to",
+                    "gazebo",
+                    "picnic"
                 ],
                 "tags": {
-                    "aerialway": "station"
+                    "amenity": "shelter"
                 },
-                "name": "Aerialway Station"
+                "name": "Shelter"
             },
-            "aerialway/t-bar": {
-                "geometry": [
-                    "line"
-                ],
+            "amenity/social_facility": {
                 "fields": [
-                    "aerialway/capacity",
-                    "aerialway/duration"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "wheelchair",
+                    "social_facility_for"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "aerialway": "t-bar"
+                    "amenity": "social_facility"
                 },
-                "name": "T-bar Lift"
+                "name": "Social Facility"
             },
-            "aeroway": {
-                "icon": "airport",
+            "amenity/social_facility/food_bank": {
                 "fields": [
-                    "aeroway"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "social_facility_for"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "aeroway": "*"
+                    "amenity": "social_facility",
+                    "social_facility": "food_bank"
                 },
-                "name": "Aeroway"
+                "name": "Food Bank"
             },
-            "aeroway/aerodrome": {
-                "icon": "airport",
+            "amenity/social_facility/group_home": {
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "wheelchair",
+                    "social_facility_for"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "terms": [
-                    "airplane",
-                    "airport",
-                    "aerodrome"
-                ],
-                "fields": [
-                    "ref",
-                    "iata",
-                    "icao",
-                    "operator"
+                    "old",
+                    "senior",
+                    "living"
                 ],
                 "tags": {
-                    "aeroway": "aerodrome"
+                    "amenity": "social_facility",
+                    "social_facility": "group_home",
+                    "social_facility_for": "senior"
                 },
-                "name": "Airport"
+                "name": "Elderly Group Home"
             },
-            "aeroway/apron": {
-                "icon": "airport",
+            "amenity/social_facility/homeless_shelter": {
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "wheelchair",
+                    "social_facility_for"
+                ],
                 "geometry": [
+                    "point",
                     "area"
                 ],
                 "terms": [
-                    "ramp"
-                ],
-                "fields": [
-                    "ref",
-                    "surface"
+                    "houseless",
+                    "unhoused",
+                    "displaced"
                 ],
                 "tags": {
-                    "aeroway": "apron"
+                    "amenity": "social_facility",
+                    "social_facility": "shelter",
+                    "social_facility:for": "homeless"
                 },
-                "name": "Apron"
+                "name": "Homeless Shelter"
             },
-            "aeroway/gate": {
-                "icon": "airport",
+            "amenity/studio": {
+                "icon": "music",
+                "fields": [
+                    "studio_type",
+                    "address",
+                    "building_area"
+                ],
                 "geometry": [
-                    "point"
+                    "point",
+                    "area"
                 ],
-                "fields": [
-                    "ref"
+                "terms": [
+                    "recording",
+                    "radio",
+                    "television"
                 ],
                 "tags": {
-                    "aeroway": "gate"
+                    "amenity": "studio"
                 },
-                "name": "Airport gate"
+                "name": "Studio"
             },
-            "aeroway/hangar": {
+            "amenity/swimming_pool": {
+                "icon": "swimming",
                 "geometry": [
+                    "point",
+                    "vertex",
                     "area"
                 ],
-                "fields": [
-                    "building_area"
-                ],
                 "tags": {
-                    "aeroway": "hangar"
+                    "amenity": "swimming_pool"
                 },
-                "name": "Hangar"
+                "name": "Swimming Pool",
+                "searchable": false
             },
-            "aeroway/helipad": {
-                "icon": "heliport",
+            "amenity/taxi": {
+                "icon": "car",
+                "fields": [
+                    "operator",
+                    "capacity"
+                ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "terms": [
-                    "helicopter",
-                    "helipad",
-                    "heliport"
+                    "cab"
                 ],
                 "tags": {
-                    "aeroway": "helipad"
+                    "amenity": "taxi"
                 },
-                "name": "Helipad"
+                "name": "Taxi Stand"
             },
-            "aeroway/runway": {
+            "amenity/telephone": {
+                "icon": "telephone",
                 "geometry": [
-                    "line",
-                    "area"
+                    "point",
+                    "vertex"
                 ],
+                "tags": {
+                    "amenity": "telephone"
+                },
                 "terms": [
-                    "landing strip"
+                    "phone"
                 ],
+                "name": "Telephone"
+            },
+            "amenity/theatre": {
+                "icon": "theatre",
                 "fields": [
-                    "ref",
-                    "surface"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
-                "tags": {
-                    "aeroway": "runway"
-                },
-                "name": "Runway"
-            },
-            "aeroway/taxiway": {
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
-                "fields": [
-                    "ref",
-                    "surface"
+                "terms": [
+                    "theatre",
+                    "performance",
+                    "play",
+                    "musical"
                 ],
                 "tags": {
-                    "aeroway": "taxiway"
+                    "amenity": "theatre"
                 },
-                "name": "Taxiway"
+                "name": "Theater"
             },
-            "aeroway/terminal": {
+            "amenity/toilets": {
+                "icon": "toilets",
+                "fields": [
+                    "toilets/disposal",
+                    "operator",
+                    "building_area",
+                    "access_toilets"
+                ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "terms": [
-                    "airport",
-                    "aerodrome"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area"
+                    "bathroom",
+                    "restroom",
+                    "outhouse",
+                    "privy",
+                    "head",
+                    "lavatory",
+                    "latrine",
+                    "water closet",
+                    "WC",
+                    "W.C."
                 ],
                 "tags": {
-                    "aeroway": "terminal"
+                    "amenity": "toilets"
                 },
-                "name": "Airport terminal"
+                "name": "Toilets"
             },
-            "amenity": {
+            "amenity/townhall": {
+                "icon": "town-hall",
                 "fields": [
-                    "amenity"
+                    "operator",
+                    "address",
+                    "building_area"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "village",
+                    "city",
+                    "government",
+                    "courthouse",
+                    "municipal"
+                ],
                 "tags": {
-                    "amenity": "*"
+                    "amenity": "townhall"
                 },
-                "name": "Amenity"
+                "name": "Town Hall"
             },
-            "amenity/arts_centre": {
-                "name": "Arts Center",
+            "amenity/university": {
+                "icon": "college",
+                "fields": [
+                    "operator",
+                    "address"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "terms": [
-                    "arts",
-                    "arts centre"
+                    "college"
                 ],
                 "tags": {
-                    "amenity": "arts_centre"
+                    "amenity": "university"
                 },
-                "icon": "theatre",
-                "fields": [
-                    "building_area",
-                    "address"
-                ]
+                "name": "University Grounds"
             },
-            "amenity/atm": {
-                "icon": "bank",
+            "amenity/vending_machine": {
                 "fields": [
+                    "vending",
                     "operator"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex"
+                    "point"
+                ],
+                "terms": [
+                    "snack",
+                    "soda",
+                    "ticket"
                 ],
                 "tags": {
-                    "amenity": "atm"
+                    "amenity": "vending_machine"
                 },
-                "name": "ATM"
+                "name": "Vending Machine"
             },
-            "amenity/bank": {
-                "icon": "bank",
+            "amenity/veterinary": {
+                "icon": "dog-park",
                 "fields": [
-                    "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "terms": [
-                    "coffer",
-                    "countinghouse",
-                    "credit union",
-                    "depository",
-                    "exchequer",
-                    "fund",
-                    "hoard",
-                    "investment firm",
-                    "repository",
-                    "reserve",
-                    "reservoir",
-                    "safe",
-                    "savings",
-                    "stock",
-                    "stockpile",
-                    "store",
-                    "storehouse",
-                    "thrift",
-                    "treasury",
-                    "trust company",
-                    "vault"
+                    "pet clinic",
+                    "veterinarian",
+                    "animal hospital",
+                    "pet doctor"
                 ],
                 "tags": {
-                    "amenity": "bank"
+                    "amenity": "veterinary"
                 },
-                "name": "Bank"
+                "name": "Veterinary"
             },
-            "amenity/bar": {
-                "icon": "bar",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "opening_hours",
-                    "smoking"
+            "amenity/waste_basket": {
+                "icon": "waste-basket",
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "amenity": "waste_basket"
+                },
+                "terms": [
+                    "rubbish",
+                    "litter",
+                    "trash",
+                    "garbage"
+                ],
+                "name": "Waste Basket"
+            },
+            "area": {
+                "name": "Area",
+                "tags": {
+                    "area": "yes"
+                },
+                "geometry": [
+                    "area"
                 ],
+                "matchScore": 0.1
+            },
+            "barrier": {
                 "geometry": [
                     "point",
                     "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "bar"
+                    "barrier": "*"
                 },
-                "terms": [],
-                "name": "Bar"
+                "fields": [
+                    "barrier"
+                ],
+                "name": "Barrier"
             },
-            "amenity/bbq": {
+            "barrier/block": {
+                "fields": [
+                    "access"
+                ],
                 "geometry": [
-                    "point"
+                    "point",
+                    "vertex"
                 ],
                 "tags": {
-                    "amenity": "bbq"
+                    "barrier": "block"
                 },
+                "name": "Block"
+            },
+            "barrier/bollard": {
                 "fields": [
-                    "covered",
-                    "fuel"
-                ],
-                "terms": [
-                    "barbecue",
-                    "bbq",
-                    "grill"
+                    "access"
                 ],
-                "name": "Barbecue/Grill"
-            },
-            "amenity/bench": {
                 "geometry": [
                     "point",
                     "vertex",
                     "line"
                 ],
                 "tags": {
-                    "amenity": "bench"
+                    "barrier": "bollard"
                 },
-                "fields": [
-                    "backrest"
-                ],
-                "name": "Bench"
+                "name": "Bollard"
             },
-            "amenity/bicycle_parking": {
-                "icon": "bicycle",
-                "fields": [
-                    "bicycle_parking",
-                    "capacity",
-                    "operator",
-                    "covered",
-                    "access_simple"
+            "barrier/cattle_grid": {
+                "geometry": [
+                    "vertex"
                 ],
+                "tags": {
+                    "barrier": "cattle_grid"
+                },
+                "name": "Cattle Grid"
+            },
+            "barrier/city_wall": {
                 "geometry": [
-                    "point",
-                    "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "bicycle_parking"
+                    "barrier": "city_wall"
                 },
-                "name": "Bicycle Parking"
+                "name": "City Wall"
             },
-            "amenity/bicycle_rental": {
-                "icon": "bicycle",
+            "barrier/cycle_barrier": {
                 "fields": [
-                    "capacity",
-                    "network",
-                    "operator"
+                    "access"
+                ],
+                "geometry": [
+                    "vertex"
                 ],
+                "tags": {
+                    "barrier": "cycle_barrier"
+                },
+                "name": "Cycle Barrier"
+            },
+            "barrier/ditch": {
                 "geometry": [
-                    "point",
-                    "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "bicycle_rental"
+                    "barrier": "ditch"
                 },
-                "name": "Bicycle Rental"
+                "name": "Ditch"
             },
-            "amenity/boat_rental": {
+            "barrier/entrance": {
+                "icon": "entrance",
                 "geometry": [
-                    "point",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
-                    "amenity": "boat_rental"
+                    "barrier": "entrance"
                 },
-                "fields": [
-                    "operator"
+                "name": "Entrance",
+                "searchable": false
+            },
+            "barrier/fence": {
+                "geometry": [
+                    "line"
                 ],
-                "name": "Boat Rental"
+                "tags": {
+                    "barrier": "fence"
+                },
+                "name": "Fence"
             },
-            "amenity/cafe": {
-                "icon": "cafe",
+            "barrier/gate": {
                 "fields": [
-                    "cuisine",
-                    "internet_access",
-                    "building_area",
-                    "address",
-                    "opening_hours",
-                    "smoking"
+                    "access"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
-                    "area"
-                ],
-                "terms": [
-                    "coffee",
-                    "tea",
-                    "coffee shop"
+                    "line"
                 ],
                 "tags": {
-                    "amenity": "cafe"
+                    "barrier": "gate"
                 },
-                "name": "Cafe"
+                "name": "Gate"
             },
-            "amenity/car_rental": {
-                "icon": "car",
+            "barrier/hedge": {
                 "geometry": [
-                    "point",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "car_rental"
+                    "barrier": "hedge"
                 },
+                "name": "Hedge"
+            },
+            "barrier/kissing_gate": {
                 "fields": [
-                    "operator"
+                    "access"
                 ],
-                "name": "Car Rental"
-            },
-            "amenity/car_sharing": {
-                "icon": "car",
                 "geometry": [
-                    "point",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
-                    "amenity": "car_sharing"
+                    "barrier": "kissing_gate"
                 },
+                "name": "Kissing Gate"
+            },
+            "barrier/lift_gate": {
                 "fields": [
-                    "operator",
-                    "capacity"
+                    "access"
                 ],
-                "name": "Car Sharing"
-            },
-            "amenity/car_wash": {
                 "geometry": [
                     "point",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
-                    "amenity": "car_wash"
+                    "barrier": "lift_gate"
                 },
-                "fields": [
-                    "building_area"
+                "name": "Lift Gate"
+            },
+            "barrier/retaining_wall": {
+                "geometry": [
+                    "line",
+                    "area"
                 ],
-                "name": "Car Wash"
+                "tags": {
+                    "barrier": "retaining_wall"
+                },
+                "name": "Retaining Wall"
             },
-            "amenity/childcare": {
-                "icon": "school",
+            "barrier/stile": {
                 "fields": [
-                    "building_area",
-                    "address"
+                    "access"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "terms": [
-                    "nursery",
-                    "orphanage",
-                    "playgroup"
+                    "vertex"
                 ],
                 "tags": {
-                    "amenity": "childcare"
+                    "barrier": "stile"
                 },
-                "name": "Childcare"
+                "name": "Stile"
             },
-            "amenity/cinema": {
-                "icon": "cinema",
+            "barrier/toll_booth": {
                 "fields": [
-                    "building_area",
-                    "address"
+                    "access"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "terms": [
-                    "big screen",
-                    "bijou",
-                    "cine",
-                    "drive-in",
-                    "film",
-                    "flicks",
-                    "motion pictures",
-                    "movie house",
-                    "movie theater",
-                    "moving pictures",
-                    "nabes",
-                    "photoplay",
-                    "picture show",
-                    "pictures",
-                    "playhouse",
-                    "show",
-                    "silver screen"
+                    "vertex"
                 ],
                 "tags": {
-                    "amenity": "cinema"
+                    "barrier": "toll_booth"
                 },
-                "name": "Cinema"
+                "name": "Toll Booth"
             },
-            "amenity/clinic": {
-                "name": "Clinic",
+            "barrier/wall": {
                 "geometry": [
-                    "point",
+                    "line",
                     "area"
                 ],
-                "terms": [
-                    "clinic",
-                    "medical clinic"
-                ],
                 "tags": {
-                    "amenity": "clinic"
+                    "barrier": "wall"
                 },
-                "icon": "hospital",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "opening_hours"
-                ]
+                "name": "Wall"
             },
-            "amenity/clock": {
+            "boundary/administrative": {
+                "name": "Administrative Boundary",
                 "geometry": [
-                    "point",
-                    "vertex"
+                    "line"
                 ],
                 "tags": {
-                    "amenity": "clock"
+                    "boundary": "administrative"
                 },
-                "name": "Clock"
+                "fields": [
+                    "admin_level"
+                ]
             },
-            "amenity/college": {
-                "icon": "college",
+            "building": {
+                "icon": "building",
                 "fields": [
-                    "operator",
+                    "building",
+                    "levels",
                     "address"
                 ],
                 "geometry": [
-                    "point",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "college"
+                    "building": "*"
                 },
                 "terms": [],
-                "name": "College"
+                "name": "Building"
             },
-            "amenity/courthouse": {
+            "building/apartments": {
+                "icon": "commercial",
                 "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "courthouse"
+                    "building": "apartments"
                 },
-                "name": "Courthouse"
+                "name": "Apartments"
             },
-            "amenity/dentist": {
-                "name": "Dentist",
+            "building/barn": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [
-                    "dentist",
-                    "dentist's office"
-                ],
                 "tags": {
-                    "amenity": "dentist"
+                    "building": "barn"
                 },
-                "icon": "hospital",
+                "name": "Barn"
+            },
+            "building/bunker": {
                 "fields": [
-                    "building_area",
                     "address",
-                    "opening_hours"
-                ]
-            },
-            "amenity/doctor": {
-                "name": "Doctor",
+                    "levels"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [
-                    "doctor",
-                    "doctor's office"
-                ],
                 "tags": {
-                    "amenity": "doctors"
+                    "building": "bunker"
                 },
-                "icon": "hospital",
+                "name": "Bunker",
+                "searchable": false
+            },
+            "building/cabin": {
+                "icon": "building",
                 "fields": [
-                    "building_area",
                     "address",
-                    "opening_hours"
-                ]
-            },
-            "amenity/drinking_water": {
-                "icon": "water",
+                    "levels"
+                ],
                 "geometry": [
-                    "point"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "amenity": "drinking_water"
+                    "building": "cabin"
                 },
-                "terms": [
-                    "water fountain",
-                    "potable water"
-                ],
-                "name": "Drinking Water"
+                "name": "Cabin"
             },
-            "amenity/embassy": {
+            "building/cathedral": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
                 "geometry": [
-                    "area",
-                    "point"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "amenity": "embassy"
+                    "building": "cathedral"
                 },
-                "fields": [
-                    "country",
-                    "building_area"
-                ],
-                "icon": "embassy",
-                "name": "Embassy"
+                "name": "Cathedral"
             },
-            "amenity/fast_food": {
-                "icon": "fast-food",
+            "building/chapel": {
+                "icon": "place-of-worship",
                 "fields": [
-                    "cuisine",
-                    "building_area",
                     "address",
-                    "opening_hours",
-                    "smoking"
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "fast_food"
+                    "building": "chapel"
                 },
-                "terms": [],
-                "name": "Fast Food"
+                "name": "Chapel"
             },
-            "amenity/fire_station": {
-                "icon": "fire-station",
+            "building/church": {
+                "icon": "place-of-worship",
                 "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "fire_station"
+                    "building": "church"
                 },
-                "terms": [],
-                "name": "Fire Station"
+                "name": "Church"
             },
-            "amenity/fountain": {
+            "building/college": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
+                "terms": [
+                    "university"
+                ],
                 "tags": {
-                    "amenity": "fountain"
+                    "building": "college"
                 },
-                "name": "Fountain"
+                "name": "College Building"
             },
-            "amenity/fuel": {
-                "icon": "fuel",
+            "building/commercial": {
+                "icon": "commercial",
                 "fields": [
-                    "operator",
                     "address",
-                    "building_area"
+                    "smoking"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "petrol",
-                    "fuel",
-                    "propane",
-                    "diesel",
-                    "lng",
-                    "cng",
-                    "biodiesel"
-                ],
                 "tags": {
-                    "amenity": "fuel"
+                    "building": "commercial"
                 },
-                "name": "Gas Station"
+                "name": "Commercial Building"
             },
-            "amenity/grave_yard": {
-                "icon": "cemetery",
+            "building/construction": {
+                "icon": "building",
                 "fields": [
-                    "religion",
-                    "denomination"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "grave_yard"
+                    "building": "construction"
                 },
-                "name": "Graveyard"
+                "name": "Building Under Construction"
             },
-            "amenity/hospital": {
-                "icon": "hospital",
+            "building/detached": {
+                "icon": "building",
                 "fields": [
-                    "emergency",
-                    "address"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "clinic",
-                    "emergency room",
-                    "health service",
-                    "hospice",
-                    "infirmary",
-                    "institution",
-                    "nursing home",
-                    "rest home",
-                    "sanatorium",
-                    "sanitarium",
-                    "sick bay",
-                    "surgery",
-                    "ward"
-                ],
                 "tags": {
-                    "amenity": "hospital"
+                    "building": "detached"
                 },
-                "name": "Hospital Grounds"
+                "name": "Detached Home"
             },
-            "amenity/kindergarten": {
-                "icon": "school",
+            "building/dormitory": {
+                "icon": "building",
                 "fields": [
-                    "address"
+                    "address",
+                    "levels",
+                    "smoking"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "nursery",
-                    "preschool"
+                "tags": {
+                    "building": "dormitory"
+                },
+                "name": "Dormitory"
+            },
+            "building/entrance": {
+                "icon": "entrance",
+                "geometry": [
+                    "vertex"
                 ],
                 "tags": {
-                    "amenity": "kindergarten"
+                    "building": "entrance"
                 },
-                "name": "Kindergarten Grounds"
+                "name": "Entrance/Exit",
+                "searchable": false
             },
-            "amenity/library": {
-                "icon": "library",
+            "building/garage": {
                 "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
+                    "capacity"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "library"
+                    "building": "garage"
                 },
-                "terms": [],
-                "name": "Library"
+                "name": "Garage",
+                "icon": "warehouse"
             },
-            "amenity/marketplace": {
+            "building/garages": {
+                "icon": "warehouse",
+                "fields": [
+                    "capacity"
+                ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "marketplace"
+                    "building": "garages"
                 },
-                "fields": [
-                    "building_area"
-                ],
-                "name": "Marketplace"
+                "name": "Garages"
             },
-            "amenity/nightclub": {
-                "icon": "bar",
+            "building/greenhouse": {
+                "icon": "building",
                 "fields": [
-                    "building_area",
                     "address",
-                    "opening_hours",
-                    "smoking"
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "nightclub"
+                    "building": "greenhouse"
                 },
-                "terms": [
-                    "disco*",
-                    "night club",
-                    "dancing",
-                    "dance club"
-                ],
-                "name": "Nightclub"
+                "name": "Greenhouse"
             },
-            "amenity/parking": {
-                "icon": "parking",
+            "building/hospital": {
+                "icon": "building",
                 "fields": [
-                    "parking",
-                    "capacity",
-                    "fee",
-                    "access_simple",
-                    "supervised",
-                    "park_ride",
-                    "address"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "parking"
+                    "building": "hospital"
                 },
-                "terms": [],
-                "name": "Car Parking"
+                "name": "Hospital Building"
             },
-            "amenity/pharmacy": {
-                "icon": "pharmacy",
+            "building/hotel": {
+                "icon": "building",
                 "fields": [
-                    "operator",
-                    "building_area",
                     "address",
-                    "opening_hours"
+                    "levels",
+                    "smoking"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "pharmacy"
+                    "building": "hotel"
                 },
-                "terms": [],
-                "name": "Pharmacy"
+                "name": "Hotel Building"
             },
-            "amenity/place_of_worship": {
-                "icon": "place-of-worship",
+            "building/house": {
+                "icon": "building",
                 "fields": [
-                    "religion",
-                    "denomination",
-                    "building_area",
-                    "address"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "abbey",
-                    "basilica",
-                    "bethel",
-                    "cathedral",
-                    "chancel",
-                    "chantry",
-                    "chapel",
-                    "church",
-                    "fold",
-                    "house of God",
-                    "house of prayer",
-                    "house of worship",
-                    "minster",
-                    "mission",
-                    "mosque",
-                    "oratory",
-                    "parish",
-                    "sacellum",
-                    "sanctuary",
-                    "shrine",
-                    "synagogue",
-                    "tabernacle",
-                    "temple"
-                ],
                 "tags": {
-                    "amenity": "place_of_worship"
+                    "building": "house"
                 },
-                "name": "Place of Worship"
+                "name": "House"
             },
-            "amenity/place_of_worship/buddhist": {
-                "icon": "place-of-worship",
-                "fields": [
-                    "denomination",
-                    "building_area",
-                    "address"
-                ],
+            "building/hut": {
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "stupa",
-                    "vihara",
-                    "monastery",
-                    "temple",
-                    "pagoda",
-                    "zendo",
-                    "dojo"
-                ],
                 "tags": {
-                    "amenity": "place_of_worship",
-                    "religion": "buddhist"
+                    "building": "hut"
                 },
-                "name": "Buddhist Temple"
+                "name": "Hut"
             },
-            "amenity/place_of_worship/christian": {
-                "icon": "religious-christian",
+            "building/industrial": {
+                "icon": "industrial",
                 "fields": [
-                    "denomination",
-                    "building_area",
-                    "address"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "christian",
-                    "abbey",
-                    "basilica",
-                    "bethel",
-                    "cathedral",
-                    "chancel",
-                    "chantry",
-                    "chapel",
-                    "church",
-                    "fold",
-                    "house of God",
-                    "house of prayer",
-                    "house of worship",
-                    "minster",
-                    "mission",
-                    "oratory",
-                    "parish",
-                    "sacellum",
-                    "sanctuary",
-                    "shrine",
-                    "tabernacle",
-                    "temple"
-                ],
                 "tags": {
-                    "amenity": "place_of_worship",
-                    "religion": "christian"
+                    "building": "industrial"
                 },
-                "name": "Church"
+                "name": "Industrial Building"
             },
-            "amenity/place_of_worship/jewish": {
-                "icon": "religious-jewish",
+            "building/kindergarten": {
+                "icon": "building",
                 "fields": [
-                    "denomination",
-                    "building_area",
-                    "address"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "terms": [
-                    "jewish",
-                    "synagogue"
+                    "kindergarden",
+                    "pre-school"
                 ],
                 "tags": {
-                    "amenity": "place_of_worship",
-                    "religion": "jewish"
+                    "building": "kindergarten"
                 },
-                "name": "Synagogue"
+                "name": "Preschool/Kindergarten Building"
             },
-            "amenity/place_of_worship/muslim": {
-                "icon": "religious-muslim",
+            "building/public": {
+                "icon": "building",
                 "fields": [
-                    "denomination",
-                    "building_area",
-                    "address"
+                    "address",
+                    "levels",
+                    "smoking"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "muslim",
-                    "mosque"
-                ],
                 "tags": {
-                    "amenity": "place_of_worship",
-                    "religion": "muslim"
+                    "building": "public"
                 },
-                "name": "Mosque"
+                "name": "Public Building"
             },
-            "amenity/police": {
-                "icon": "police",
+            "building/residential": {
+                "icon": "building",
                 "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "badge",
-                    "bear",
-                    "blue",
-                    "bluecoat",
-                    "bobby",
-                    "boy scout",
-                    "bull",
-                    "constable",
-                    "constabulary",
-                    "cop",
-                    "copper",
-                    "corps",
-                    "county mounty",
-                    "detective",
-                    "fed",
-                    "flatfoot",
-                    "force",
-                    "fuzz",
-                    "gendarme",
-                    "gumshoe",
-                    "heat",
-                    "law",
-                    "law enforcement",
-                    "man",
-                    "narc",
-                    "officers",
-                    "patrolman",
-                    "police"
-                ],
                 "tags": {
-                    "amenity": "police"
+                    "building": "residential"
                 },
-                "name": "Police"
+                "name": "Residential Building"
             },
-            "amenity/post_box": {
-                "icon": "post",
+            "building/retail": {
+                "icon": "building",
                 "fields": [
-                    "operator",
-                    "collection_times"
+                    "address",
+                    "levels",
+                    "smoking"
                 ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
                 "tags": {
-                    "amenity": "post_box"
+                    "building": "retail"
                 },
-                "terms": [
-                    "letter drop",
-                    "letterbox",
-                    "mail drop",
-                    "mailbox",
-                    "pillar box",
-                    "postbox"
-                ],
-                "name": "Mailbox"
+                "name": "Retail Building"
             },
-            "amenity/post_office": {
-                "icon": "post",
+            "building/roof": {
+                "icon": "building",
                 "fields": [
-                    "operator",
-                    "collection_times",
-                    "building_area"
+                    "address"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "post_office"
+                    "building": "roof"
                 },
-                "name": "Post Office"
+                "name": "Roof"
             },
-            "amenity/pub": {
-                "icon": "beer",
+            "building/school": {
+                "icon": "building",
                 "fields": [
-                    "building_area",
                     "address",
-                    "opening_hours",
-                    "smoking"
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "academy",
+                    "elementary school",
+                    "middle school",
+                    "high school"
+                ],
                 "tags": {
-                    "amenity": "pub"
+                    "building": "school"
                 },
-                "terms": [],
-                "name": "Pub"
+                "name": "School Building"
             },
-            "amenity/ranger_station": {
+            "building/shed": {
+                "icon": "building",
                 "fields": [
-                    "building_area",
-                    "opening_hours",
-                    "operator",
-                    "phone"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [
-                    "visitor center",
-                    "visitor centre",
-                    "permit center",
-                    "permit centre",
-                    "backcountry office",
-                    "warden office",
-                    "warden center"
-                ],
                 "tags": {
-                    "amenity": "ranger_station"
+                    "building": "shed"
                 },
-                "name": "Ranger Station"
+                "name": "Shed"
             },
-            "amenity/recycling": {
-                "icon": "recycling",
+            "building/stable": {
+                "icon": "building",
                 "fields": [
-                    "recycling/cans",
-                    "recycling/glass",
-                    "recycling/paper",
-                    "recycling/clothes"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
-                    "amenity": "recycling"
+                    "building": "stable"
                 },
-                "name": "Recycling"
+                "name": "Stable"
             },
-            "amenity/restaurant": {
-                "icon": "restaurant",
+            "building/static_caravan": {
+                "icon": "building",
                 "fields": [
-                    "cuisine",
-                    "building_area",
                     "address",
-                    "opening_hours",
-                    "capacity",
-                    "smoking"
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "bar",
-                    "cafeteria",
-                    "café",
-                    "canteen",
-                    "chophouse",
-                    "coffee shop",
-                    "diner",
-                    "dining room",
-                    "dive*",
-                    "doughtnut shop",
-                    "drive-in",
-                    "eatery",
-                    "eating house",
-                    "eating place",
-                    "fast-food place",
-                    "fish and chips",
-                    "greasy spoon",
-                    "grill",
-                    "hamburger stand",
-                    "hashery",
-                    "hideaway",
-                    "hotdog stand",
-                    "inn",
-                    "joint*",
-                    "luncheonette",
-                    "lunchroom",
-                    "night club",
-                    "outlet*",
-                    "pizzeria",
-                    "saloon",
-                    "soda fountain",
-                    "watering hole"
-                ],
                 "tags": {
-                    "amenity": "restaurant"
+                    "building": "static_caravan"
                 },
-                "name": "Restaurant"
+                "name": "Static Mobile Home"
             },
-            "amenity/school": {
-                "icon": "school",
+            "building/terrace": {
+                "icon": "building",
                 "fields": [
-                    "operator",
-                    "address"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "academy",
-                    "alma mater",
-                    "blackboard",
-                    "college",
-                    "department",
-                    "discipline",
-                    "establishment",
-                    "faculty",
-                    "hall",
-                    "halls of ivy",
-                    "institute",
-                    "institution",
-                    "jail*",
-                    "schoolhouse",
-                    "seminary",
-                    "university"
-                ],
                 "tags": {
-                    "amenity": "school"
+                    "building": "terrace"
                 },
-                "name": "School Grounds"
+                "name": "Row Houses"
             },
-            "amenity/shelter": {
+            "building/train_station": {
+                "icon": "building",
                 "fields": [
-                    "shelter_type"
+                    "address",
+                    "levels"
                 ],
                 "geometry": [
                     "point",
@@ -64099,3028 +69107,2952 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "amenity": "shelter"
+                    "building": "train_station"
                 },
-                "terms": [
-                    "lean-to"
-                ],
-                "name": "Shelter"
+                "name": "Train Station",
+                "searchable": false
             },
-            "amenity/social_facility": {
-                "name": "Social Facility",
+            "building/university": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [],
+                "terms": [
+                    "college"
+                ],
                 "tags": {
-                    "amenity": "social_facility"
+                    "building": "university"
                 },
+                "name": "University Building"
+            },
+            "building/warehouse": {
+                "icon": "building",
                 "fields": [
-                    "social_facility_for",
                     "address",
-                    "phone",
-                    "opening_hours",
-                    "wheelchair",
-                    "operator"
-                ]
-            },
-            "amenity/social_facility/food_bank": {
-                "name": "Food Bank",
+                    "levels"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
-                    "amenity": "social_facility",
-                    "social_facility": "food_bank"
+                    "building": "warehouse"
                 },
+                "name": "Warehouse"
+            },
+            "craft": {
+                "icon": "marker-stroked",
                 "fields": [
-                    "social_facility_for",
+                    "craft",
+                    "operator",
                     "address",
-                    "phone",
-                    "opening_hours",
-                    "wheelchair",
-                    "operator"
-                ]
-            },
-            "amenity/social_facility/group_home": {
-                "name": "Group Home",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [
-                    "elderly",
-                    "old",
-                    "senior living"
-                ],
                 "tags": {
-                    "amenity": "social_facility",
-                    "social_facility": "group_home",
-                    "social_facility_for": "senior"
+                    "craft": "*"
                 },
+                "terms": [],
+                "name": "Craft"
+            },
+            "craft/basket_maker": {
+                "icon": "art-gallery",
                 "fields": [
-                    "social_facility_for",
+                    "operator",
                     "address",
-                    "phone",
-                    "opening_hours",
-                    "wheelchair",
-                    "operator"
-                ]
-            },
-            "amenity/social_facility/homeless_shelter": {
-                "name": "Homeless Shelter",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [
-                    "houseless",
-                    "unhoused",
-                    "displaced"
-                ],
                 "tags": {
-                    "amenity": "social_facility",
-                    "social_facility": "shelter",
-                    "social_facility:for": "homeless"
+                    "craft": "basket_maker"
                 },
+                "name": "Basket Maker"
+            },
+            "craft/beekeeper": {
+                "icon": "farm",
                 "fields": [
-                    "social_facility_for",
+                    "operator",
                     "address",
-                    "phone",
-                    "opening_hours",
-                    "wheelchair",
-                    "operator"
-                ]
-            },
-            "amenity/studio": {
-                "name": "Studio",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [
-                    "recording studio",
-                    "studio",
-                    "radio",
-                    "radio studio",
-                    "television",
-                    "television studio"
-                ],
                 "tags": {
-                    "amenity": "studio"
+                    "craft": "beekeeper"
                 },
-                "icon": "music",
+                "name": "Beekeeper"
+            },
+            "craft/blacksmith": {
+                "icon": "farm",
                 "fields": [
+                    "operator",
+                    "address",
                     "building_area",
-                    "studio_type",
-                    "address"
-                ]
-            },
-            "amenity/swimming_pool": {
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "swimming_pool"
+                    "craft": "blacksmith"
                 },
-                "icon": "swimming",
-                "searchable": false,
-                "name": "Swimming Pool"
+                "name": "Blacksmith"
             },
-            "amenity/taxi": {
+            "craft/boatbuilder": {
+                "icon": "marker-stroked",
                 "fields": [
                     "operator",
-                    "capacity"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "cab"
-                ],
                 "tags": {
-                    "amenity": "taxi"
+                    "craft": "boatbuilder"
                 },
-                "name": "Taxi Stand"
+                "name": "Boat Builder"
             },
-            "amenity/telephone": {
-                "icon": "telephone",
+            "craft/bookbinder": {
+                "icon": "library",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
-                "tags": {
-                    "amenity": "telephone"
-                },
                 "terms": [
-                    "phone"
+                    "book repair"
                 ],
-                "name": "Telephone"
+                "tags": {
+                    "craft": "bookbinder"
+                },
+                "name": "Bookbinder"
             },
-            "amenity/theatre": {
-                "icon": "theatre",
+            "craft/brewery": {
+                "icon": "beer",
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "terms": [
-                    "theatre",
-                    "performance",
-                    "play",
-                    "musical"
+                    "beer",
+                    "bier"
                 ],
                 "tags": {
-                    "amenity": "theatre"
+                    "craft": "brewery"
                 },
-                "name": "Theater"
+                "name": "Brewery"
             },
-            "amenity/toilets": {
+            "craft/carpenter": {
+                "icon": "logging",
                 "fields": [
-                    "toilets/disposal",
                     "operator",
+                    "address",
                     "building_area",
-                    "fee",
-                    "access_simple"
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "terms": [
-                    "bathroom",
-                    "restroom",
-                    "outhouse",
-                    "privy",
-                    "head",
-                    "lavatory",
-                    "latrine",
-                    "water closet",
-                    "WC",
-                    "W.C."
+                    "woodworker"
                 ],
                 "tags": {
-                    "amenity": "toilets"
+                    "craft": "carpenter"
                 },
-                "icon": "toilets",
-                "name": "Toilets"
+                "name": "Carpenter"
             },
-            "amenity/townhall": {
-                "icon": "town-hall",
+            "craft/carpet_layer": {
+                "icon": "square",
                 "fields": [
+                    "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "village hall",
-                    "city government",
-                    "courthouse",
-                    "municipal building",
-                    "municipal center",
-                    "municipal centre"
-                ],
                 "tags": {
-                    "amenity": "townhall"
+                    "craft": "carpet_layer"
                 },
-                "name": "Town Hall"
+                "name": "Carpet Layer"
             },
-            "amenity/university": {
-                "icon": "college",
+            "craft/caterer": {
+                "icon": "bakery",
                 "fields": [
+                    "cuisine",
                     "operator",
-                    "address"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "amenity": "university"
+                    "craft": "caterer"
                 },
-                "terms": [
-                    "college"
-                ],
-                "name": "University"
+                "name": "Caterer"
             },
-            "amenity/vending_machine": {
+            "craft/clockmaker": {
+                "icon": "circle-stroked",
                 "fields": [
-                    "vending",
-                    "operator"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
-                    "point"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "amenity": "vending_machine"
+                    "craft": "clockmaker"
                 },
-                "name": "Vending Machine"
+                "name": "Clockmaker"
             },
-            "amenity/veterinary": {
-                "fields": [],
+            "craft/confectionary": {
+                "icon": "bakery",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "terms": [
-                    "pet clinic",
-                    "veterinarian",
-                    "animal hospital",
-                    "pet doctor"
+                    "sweets",
+                    "candy"
                 ],
                 "tags": {
-                    "amenity": "veterinary"
+                    "craft": "confectionary"
                 },
-                "name": "Veterinary"
+                "name": "Confectionary"
             },
-            "amenity/waste_basket": {
-                "icon": "waste-basket",
+            "craft/dressmaker": {
+                "icon": "clothing-store",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
-                "tags": {
-                    "amenity": "waste_basket"
-                },
                 "terms": [
-                    "rubbish bin",
-                    "litter bin",
-                    "trash can",
-                    "garbage can"
+                    "seamstress"
                 ],
-                "name": "Waste Basket"
-            },
-            "area": {
-                "name": "Area",
                 "tags": {
-                    "area": "yes"
+                    "craft": "dressmaker"
                 },
-                "geometry": [
-                    "area"
+                "name": "Dressmaker"
+            },
+            "craft/electrician": {
+                "icon": "marker-stroked",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "matchScore": 0.1
-            },
-            "barrier": {
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line",
                     "area"
                 ],
+                "terms": [
+                    "power",
+                    "wire"
+                ],
                 "tags": {
-                    "barrier": "*"
+                    "craft": "electrician"
                 },
-                "fields": [
-                    "barrier"
-                ],
-                "name": "Barrier"
+                "name": "Electrician"
             },
-            "barrier/block": {
+            "craft/gardener": {
+                "icon": "garden",
                 "fields": [
-                    "access"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
+                ],
+                "terms": [
+                    "landscaper",
+                    "grounds keeper"
                 ],
                 "tags": {
-                    "barrier": "block"
+                    "craft": "gardener"
                 },
-                "name": "Block"
+                "name": "Gardener"
             },
-            "barrier/bollard": {
+            "craft/glaziery": {
+                "icon": "fire-station",
                 "fields": [
-                    "access"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line"
+                    "area"
+                ],
+                "terms": [
+                    "glass",
+                    "stained-glass",
+                    "window"
                 ],
                 "tags": {
-                    "barrier": "bollard"
+                    "craft": "glaziery"
                 },
-                "name": "Bollard"
+                "name": "Glaziery"
             },
-            "barrier/cattle_grid": {
+            "craft/handicraft": {
+                "icon": "art-gallery",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "barrier": "cattle_grid"
+                    "craft": "handicraft"
                 },
-                "name": "Cattle Grid"
+                "name": "Handicraft"
             },
-            "barrier/city_wall": {
+            "craft/hvac": {
+                "icon": "marker-stroked",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
+                "terms": [
+                    "heat*",
+                    "vent*",
+                    "air conditioning"
+                ],
                 "tags": {
-                    "barrier": "city_wall"
+                    "craft": "hvac"
                 },
-                "name": "City Wall"
+                "name": "HVAC"
             },
-            "barrier/cycle_barrier": {
+            "craft/insulator": {
+                "icon": "marker-stroked",
                 "fields": [
-                    "access"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "barrier": "cycle_barrier"
+                    "craft": "insulation"
                 },
-                "name": "Cycle Barrier"
+                "name": "Insulator"
             },
-            "barrier/ditch": {
+            "craft/jeweler": {
+                "icon": "marker-stroked",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
                 "tags": {
-                    "barrier": "ditch"
+                    "craft": "jeweler"
                 },
-                "name": "Ditch"
+                "name": "Jeweler",
+                "searchable": false
             },
-            "barrier/entrance": {
-                "icon": "entrance",
+            "craft/key_cutter": {
+                "icon": "marker-stroked",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "barrier": "entrance"
+                    "craft": "key_cutter"
                 },
-                "name": "Entrance",
-                "searchable": false
+                "name": "Key Cutter"
             },
-            "barrier/fence": {
+            "craft/locksmith": {
+                "icon": "marker-stroked",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "barrier": "fence"
+                    "craft": "locksmith"
                 },
-                "name": "Fence"
+                "name": "Locksmith",
+                "searchable": false
             },
-            "barrier/gate": {
+            "craft/metal_construction": {
+                "icon": "marker-stroked",
                 "fields": [
-                    "access"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line"
+                    "area"
                 ],
                 "tags": {
-                    "barrier": "gate"
+                    "craft": "metal_construction"
                 },
-                "name": "Gate"
+                "name": "Metal Construction"
             },
-            "barrier/hedge": {
+            "craft/optician": {
+                "icon": "marker-stroked",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
                 "tags": {
-                    "barrier": "hedge"
+                    "craft": "optician"
                 },
-                "name": "Hedge"
+                "name": "Optician",
+                "searchable": false
             },
-            "barrier/kissing_gate": {
+            "craft/painter": {
+                "icon": "art-gallery",
                 "fields": [
-                    "access"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "barrier": "kissing_gate"
+                    "craft": "painter"
                 },
-                "name": "Kissing Gate"
+                "name": "Painter"
             },
-            "barrier/lift_gate": {
+            "craft/photographer": {
+                "icon": "camera",
                 "fields": [
-                    "access"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
                 "tags": {
-                    "barrier": "lift_gate"
+                    "craft": "photographer"
                 },
-                "name": "Lift Gate"
+                "name": "Photographer"
             },
-            "barrier/retaining_wall": {
+            "craft/photographic_laboratory": {
+                "icon": "camera",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
+                "terms": [
+                    "film"
+                ],
                 "tags": {
-                    "barrier": "retaining_wall"
+                    "craft": "photographic_laboratory"
                 },
-                "name": "Retaining Wall"
+                "name": "Photographic Laboratory"
             },
-            "barrier/stile": {
+            "craft/plasterer": {
+                "icon": "marker-stroked",
                 "fields": [
-                    "access"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
                 "tags": {
-                    "barrier": "stile"
+                    "craft": "plasterer"
                 },
-                "name": "Stile"
+                "name": "Plasterer"
             },
-            "barrier/toll_booth": {
+            "craft/plumber": {
+                "icon": "marker-stroked",
                 "fields": [
-                    "access"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "pipe"
                 ],
                 "tags": {
-                    "barrier": "toll_booth"
+                    "craft": "plumber"
                 },
-                "name": "Toll Booth"
+                "name": "Plumber"
             },
-            "barrier/wall": {
+            "craft/pottery": {
+                "icon": "art-gallery",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
+                "terms": [
+                    "ceramic"
+                ],
                 "tags": {
-                    "barrier": "wall"
+                    "craft": "pottery"
                 },
-                "name": "Wall"
+                "name": "Pottery"
             },
-            "boundary/administrative": {
-                "name": "Administrative Boundary",
+            "craft/rigger": {
+                "icon": "marker-stroked",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "boundary": "administrative"
+                    "craft": "rigger"
                 },
-                "fields": [
-                    "admin_level"
-                ]
+                "name": "Rigger"
             },
-            "building": {
-                "icon": "building",
+            "craft/roofer": {
+                "icon": "marker-stroked",
                 "fields": [
-                    "building",
-                    "levels",
+                    "operator",
                     "address",
-                    "smoking"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
+                    "point",
                     "area"
                 ],
                 "tags": {
-                    "building": "*"
+                    "craft": "roofer"
                 },
-                "terms": [],
-                "name": "Building"
+                "name": "Roofer"
             },
-            "building/apartments": {
-                "icon": "commercial",
+            "craft/saddler": {
+                "icon": "marker-stroked",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "apartments"
+                    "craft": "saddler"
                 },
-                "name": "Apartments"
+                "name": "Saddler"
             },
-            "building/barn": {
-                "icon": "building",
+            "craft/sailmaker": {
+                "icon": "marker-stroked",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "barn"
+                    "craft": "sailmaker"
                 },
-                "name": "Barn"
+                "name": "Sailmaker"
             },
-            "building/bunker": {
+            "craft/sawmill": {
+                "icon": "park",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "lumber"
+                ],
                 "tags": {
-                    "building": "bunker"
+                    "craft": "sawmill"
                 },
-                "name": "Bunker",
-                "searchable": false
+                "name": "Sawmill"
             },
-            "building/cabin": {
-                "icon": "building",
+            "craft/scaffolder": {
+                "icon": "marker-stroked",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "cabin"
+                    "craft": "scaffolder"
                 },
-                "name": "Cabin"
+                "name": "Scaffolder"
             },
-            "building/cathedral": {
-                "icon": "place-of-worship",
+            "craft/sculpter": {
+                "icon": "art-gallery",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "cathedral"
+                    "craft": "sculpter"
                 },
-                "name": "Cathedral"
+                "name": "Sculpter"
             },
-            "building/chapel": {
-                "icon": "place-of-worship",
+            "craft/shoemaker": {
+                "icon": "marker-stroked",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "cobbler"
+                ],
                 "tags": {
-                    "building": "chapel"
+                    "craft": "shoemaker"
                 },
-                "name": "Chapel"
+                "name": "Shoemaker"
             },
-            "building/church": {
-                "icon": "place-of-worship",
+            "craft/stonemason": {
+                "icon": "marker-stroked",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "masonry"
+                ],
                 "tags": {
-                    "building": "church"
+                    "craft": "stonemason"
                 },
-                "name": "Church"
+                "name": "Stonemason"
             },
-            "building/commercial": {
-                "icon": "commercial",
+            "craft/sweep": {
+                "icon": "marker-stroked",
                 "fields": [
+                    "operator",
                     "address",
-                    "smoking"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "commercial"
+                    "craft": "sweep"
                 },
-                "name": "Commercial Building"
+                "name": "Chimney Sweep"
             },
-            "building/construction": {
-                "icon": "building",
+            "craft/tailor": {
+                "icon": "clothing-store",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "clothes",
+                    "suit"
+                ],
                 "tags": {
-                    "building": "construction"
+                    "craft": "tailor"
                 },
-                "name": "Building Under Construction"
+                "name": "Tailor",
+                "searchable": false
             },
-            "building/detached": {
-                "icon": "building",
+            "craft/tiler": {
+                "icon": "marker-stroked",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "detached"
+                    "craft": "tiler"
                 },
-                "name": "Detached Home"
+                "name": "Tiler"
             },
-            "building/dormitory": {
-                "icon": "building",
+            "craft/tinsmith": {
+                "icon": "marker-stroked",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels",
-                    "smoking"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "dormitory"
+                    "craft": "tinsmith"
                 },
-                "name": "Dormitory"
+                "name": "Tinsmith"
             },
-            "building/entrance": {
-                "icon": "entrance",
+            "craft/upholsterer": {
+                "icon": "marker-stroked",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "building": "entrance"
+                    "craft": "upholsterer"
                 },
-                "name": "Entrance",
-                "searchable": false
+                "name": "Upholsterer"
             },
-            "building/garage": {
+            "craft/watchmaker": {
+                "icon": "circle-stroked",
                 "fields": [
-                    "capacity"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "garage"
+                    "craft": "watchmaker"
                 },
-                "name": "Garage",
-                "icon": "warehouse"
+                "name": "Watchmaker"
             },
-            "building/garages": {
-                "icon": "warehouse",
+            "craft/window_construction": {
+                "icon": "marker-stroked",
                 "fields": [
-                    "capacity"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "glass"
+                ],
                 "tags": {
-                    "building": "garages"
+                    "craft": "window_construction"
                 },
-                "name": "Garages"
+                "name": "Window Construction"
             },
-            "building/greenhouse": {
-                "icon": "building",
+            "craft/winery": {
+                "icon": "alcohol-shop",
                 "fields": [
+                    "operator",
                     "address",
-                    "levels"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "greenhouse"
+                    "craft": "winery"
                 },
-                "name": "Greenhouse"
+                "name": "Winery"
             },
-            "building/hospital": {
-                "icon": "building",
+            "embankment": {
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "embankment": "yes"
+                },
+                "name": "Embankment",
+                "matchScore": 0.2
+            },
+            "emergency/ambulance_station": {
+                "icon": "hospital",
                 "fields": [
-                    "address",
-                    "levels"
+                    "operator",
+                    "building_area",
+                    "address"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "EMS",
+                    "EMT",
+                    "rescue"
+                ],
                 "tags": {
-                    "building": "hospital"
+                    "emergency": "ambulance_station"
                 },
-                "name": "Hospital Building"
+                "name": "Ambulance Station"
             },
-            "building/hotel": {
-                "icon": "building",
+            "emergency/fire_hydrant": {
                 "fields": [
-                    "address",
-                    "levels",
-                    "smoking"
+                    "fire_hydrant/type"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
-                    "building": "hotel"
+                    "emergency": "fire_hydrant"
                 },
-                "name": "Hotel Building"
+                "name": "Fire Hydrant"
             },
-            "building/house": {
-                "icon": "building",
+            "emergency/phone": {
+                "icon": "emergency-telephone",
                 "fields": [
-                    "address",
-                    "levels"
+                    "operator"
                 ],
                 "geometry": [
                     "point",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
-                    "building": "house"
+                    "emergency": "phone"
                 },
-                "name": "House"
+                "name": "Emergency Phone"
             },
-            "building/hut": {
+            "entrance": {
+                "icon": "entrance",
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
-                    "building": "hut"
+                    "entrance": "*"
                 },
-                "name": "Hut"
+                "fields": [
+                    "entrance",
+                    "access_simple",
+                    "address"
+                ],
+                "name": "Entrance/Exit"
             },
-            "building/industrial": {
-                "icon": "industrial",
+            "footway/crossing": {
                 "fields": [
-                    "address",
-                    "levels"
+                    "crossing",
+                    "access",
+                    "surface",
+                    "sloped_curb",
+                    "tactile_paving"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "building": "industrial"
+                    "highway": "footway",
+                    "footway": "crossing"
                 },
-                "name": "Industrial Building"
+                "terms": [],
+                "name": "Crossing"
             },
-            "building/public": {
-                "icon": "building",
+            "footway/crosswalk": {
                 "fields": [
-                    "address",
-                    "levels",
-                    "smoking"
+                    "crossing",
+                    "access",
+                    "surface",
+                    "sloped_curb",
+                    "tactile_paving"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "building": "public"
+                    "highway": "footway",
+                    "footway": "crossing",
+                    "crossing": "zebra"
                 },
-                "name": "Public Building"
+                "terms": [
+                    "zebra crossing"
+                ],
+                "name": "Crosswalk"
             },
-            "building/residential": {
-                "icon": "building",
+            "footway/sidewalk": {
                 "fields": [
-                    "address",
-                    "levels"
+                    "surface",
+                    "lit",
+                    "width",
+                    "structure",
+                    "access"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "building": "residential"
+                    "highway": "footway",
+                    "footway": "sidewalk"
                 },
-                "name": "Residential Building"
+                "terms": [],
+                "name": "Sidewalk"
             },
-            "building/retail": {
-                "icon": "building",
-                "fields": [
-                    "address",
-                    "levels",
-                    "smoking"
+            "ford": {
+                "geometry": [
+                    "vertex"
                 ],
+                "tags": {
+                    "ford": "yes"
+                },
+                "name": "Ford"
+            },
+            "golf/bunker": {
+                "icon": "golf",
                 "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "retail"
+                    "golf": "bunker",
+                    "natural": "sand"
                 },
-                "name": "Retail Building"
-            },
-            "building/roof": {
-                "icon": "building",
-                "fields": [
-                    "address",
-                    "levels"
+                "terms": [
+                    "hazard",
+                    "bunker"
                 ],
+                "name": "Sand Trap"
+            },
+            "golf/fairway": {
+                "icon": "golf",
                 "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "roof"
+                    "golf": "fairway",
+                    "landuse": "grass"
                 },
-                "name": "Roof"
+                "name": "Fairway"
             },
-            "building/school": {
-                "icon": "building",
-                "fields": [
-                    "address",
-                    "levels"
-                ],
+            "golf/green": {
+                "icon": "golf",
                 "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "school"
+                    "golf": "green",
+                    "landuse": "grass",
+                    "leisure": "pitch",
+                    "sport": "golf"
                 },
-                "name": "School Building"
+                "name": "Putting Green"
             },
-            "building/shed": {
-                "icon": "building",
+            "golf/hole": {
+                "icon": "golf",
                 "fields": [
-                    "address",
-                    "levels"
+                    "golf_hole",
+                    "par",
+                    "handicap"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "building": "shed"
+                    "golf": "hole"
                 },
-                "name": "Shed"
+                "name": "Golf Hole"
             },
-            "building/stable": {
-                "icon": "building",
-                "fields": [
-                    "address",
-                    "levels"
-                ],
+            "golf/lateral_water_hazard": {
+                "icon": "golf",
                 "geometry": [
-                    "point",
-                    "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "building": "stable"
+                    "golf": "lateral_water_hazard",
+                    "natural": "water"
                 },
-                "name": "Stable"
+                "name": "Lateral Water Hazard"
             },
-            "building/static_caravan": {
-                "icon": "building",
-                "fields": [
-                    "address",
-                    "levels"
-                ],
+            "golf/rough": {
+                "icon": "golf",
                 "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "static_caravan"
+                    "golf": "rough",
+                    "landuse": "grass"
                 },
-                "name": "Static Mobile Home"
+                "name": "Rough"
             },
-            "building/terrace": {
-                "icon": "building",
-                "fields": [
-                    "address",
-                    "levels"
-                ],
+            "golf/tee": {
+                "icon": "golf",
                 "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "building": "terrace"
+                    "golf": "tee",
+                    "landuse": "grass"
                 },
-                "name": "Row Houses"
-            },
-            "building/train_station": {
-                "icon": "building",
-                "fields": [
-                    "address",
-                    "levels"
+                "terms": [
+                    "teeing ground"
                 ],
+                "name": "Tee Box"
+            },
+            "golf/water_hazard": {
+                "icon": "golf",
                 "geometry": [
-                    "point",
-                    "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "building": "train_station"
+                    "golf": "water_hazard",
+                    "natural": "water"
                 },
-                "name": "Train Station",
-                "searchable": false
+                "name": "Water Hazard"
             },
-            "building/university": {
-                "icon": "building",
+            "highway": {
                 "fields": [
-                    "address",
-                    "levels"
+                    "highway"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "building": "university"
+                    "highway": "*"
                 },
-                "name": "University Building"
+                "name": "Highway"
             },
-            "building/warehouse": {
-                "icon": "building",
+            "highway/bridleway": {
                 "fields": [
-                    "address",
-                    "levels"
+                    "surface",
+                    "width",
+                    "structure",
+                    "access"
                 ],
+                "icon": "highway-bridleway",
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "building": "warehouse"
+                    "highway": "bridleway"
                 },
-                "name": "Warehouse"
+                "terms": [
+                    "bridleway",
+                    "equestrian",
+                    "horse"
+                ],
+                "name": "Bridle Path"
             },
-            "craft/basket_maker": {
-                "name": "Basket Maker",
+            "highway/bus_stop": {
+                "icon": "bus",
+                "fields": [
+                    "operator",
+                    "shelter"
+                ],
                 "geometry": [
                     "point",
-                    "area"
-                ],
-                "terms": [
-                    "basket",
-                    "basketry",
-                    "basket maker",
-                    "basket weaver"
+                    "vertex"
                 ],
                 "tags": {
-                    "craft": "basket_maker"
+                    "highway": "bus_stop"
                 },
-                "icon": "art-gallery",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Bus Stop"
             },
-            "craft/beekeeper": {
-                "name": "Beekeeper",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/crossing": {
+                "fields": [
+                    "crossing",
+                    "sloped_curb",
+                    "tactile_paving"
                 ],
-                "terms": [
-                    "bees",
-                    "beekeeper",
-                    "bee box"
+                "geometry": [
+                    "vertex"
                 ],
                 "tags": {
-                    "craft": "beekeeper"
+                    "highway": "crossing"
                 },
-                "icon": "farm",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Crossing"
             },
-            "craft/blacksmith": {
-                "name": "Blacksmith",
+            "highway/crosswalk": {
+                "fields": [
+                    "crossing",
+                    "sloped_curb",
+                    "tactile_paving"
+                ],
                 "geometry": [
-                    "point",
-                    "area"
+                    "vertex"
                 ],
+                "tags": {
+                    "highway": "crossing",
+                    "crossing": "zebra"
+                },
                 "terms": [
-                    "blacksmith"
+                    "zebra crossing"
+                ],
+                "name": "Crosswalk"
+            },
+            "highway/cycleway": {
+                "icon": "highway-cycleway",
+                "fields": [
+                    "surface",
+                    "lit",
+                    "width",
+                    "oneway",
+                    "structure",
+                    "access"
+                ],
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "blacksmith"
+                    "highway": "cycleway"
                 },
-                "icon": "farm",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "bike"
+                ],
+                "name": "Cycle Path"
             },
-            "craft/boatbuilder": {
-                "name": "Boat Builder",
+            "highway/footway": {
+                "icon": "highway-footway",
+                "fields": [
+                    "surface",
+                    "lit",
+                    "width",
+                    "structure",
+                    "access"
+                ],
                 "geometry": [
-                    "point",
+                    "line",
                     "area"
                 ],
                 "terms": [
-                    "boat builder"
+                    "hike",
+                    "hiking",
+                    "trackway",
+                    "trail",
+                    "walk"
                 ],
                 "tags": {
-                    "craft": "boatbuilder"
+                    "highway": "footway"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Foot Path"
             },
-            "craft/bookbinder": {
-                "name": "Bookbinder",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/living_street": {
+                "icon": "highway-living-street",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
                 ],
-                "terms": [
-                    "bookbinder",
-                    "book repair"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "bookbinder"
+                    "highway": "living_street"
                 },
-                "icon": "library",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Living Street"
             },
-            "craft/brewery": {
-                "name": "Brewery",
+            "highway/mini_roundabout": {
                 "geometry": [
-                    "point",
-                    "area"
-                ],
-                "terms": [
-                    "brewery"
+                    "vertex"
                 ],
                 "tags": {
-                    "craft": "brewery"
+                    "highway": "mini_roundabout"
                 },
-                "icon": "beer",
                 "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                    "clock_direction"
+                ],
+                "name": "Mini-Roundabout"
             },
-            "craft/carpenter": {
-                "name": "Carpenter",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/motorway": {
+                "icon": "highway-motorway",
+                "fields": [
+                    "oneway_yes",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "lanes",
+                    "surface",
+                    "ref"
                 ],
-                "terms": [
-                    "carpenter",
-                    "woodworker"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "carpenter"
+                    "highway": "motorway"
                 },
-                "icon": "logging",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Motorway"
             },
-            "craft/carpet_layer": {
-                "name": "Carpet Layer",
+            "highway/motorway_junction": {
                 "geometry": [
-                    "point",
-                    "area"
-                ],
-                "terms": [
-                    "carpet layer"
+                    "vertex"
                 ],
                 "tags": {
-                    "craft": "carpet_layer"
+                    "highway": "motorway_junction"
                 },
-                "icon": "square",
                 "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                    "ref"
+                ],
+                "name": "Motorway Junction / Exit"
             },
-            "craft/caterer": {
-                "name": "Caterer",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/motorway_link": {
+                "icon": "highway-motorway-link",
+                "fields": [
+                    "oneway_yes",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface",
+                    "ref"
                 ],
-                "terms": [
-                    "Caterer",
-                    "Catering"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "caterer"
+                    "highway": "motorway_link"
                 },
-                "icon": "bakery",
-                "fields": [
-                    "cuisine",
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "ramp",
+                    "on ramp",
+                    "off ramp"
+                ],
+                "name": "Motorway Link"
             },
-            "craft/clockmaker": {
-                "name": "Clockmaker",
+            "highway/path": {
+                "icon": "highway-path",
+                "fields": [
+                    "surface",
+                    "width",
+                    "structure",
+                    "access",
+                    "incline",
+                    "sac_scale",
+                    "trail_visibility",
+                    "mtb/scale",
+                    "mtb/scale/uphill",
+                    "mtb/scale/imba",
+                    "ref"
+                ],
                 "geometry": [
-                    "point",
-                    "area"
+                    "line"
                 ],
                 "terms": [
-                    "clock",
-                    "clockmaker",
-                    "clock repair"
+                    "hike",
+                    "hiking",
+                    "trackway",
+                    "trail",
+                    "walk"
                 ],
                 "tags": {
-                    "craft": "clockmaker"
+                    "highway": "path"
                 },
-                "icon": "circle-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Path"
             },
-            "craft/confectionary": {
-                "name": "Confectionary",
+            "highway/pedestrian": {
+                "fields": [
+                    "surface",
+                    "lit",
+                    "width",
+                    "oneway",
+                    "structure",
+                    "access"
+                ],
                 "geometry": [
-                    "point",
+                    "line",
                     "area"
                 ],
-                "terms": [
-                    "confectionary",
-                    "sweets",
-                    "candy"
-                ],
                 "tags": {
-                    "craft": "confectionary"
+                    "highway": "pedestrian"
                 },
-                "icon": "bakery",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Pedestrian"
             },
-            "craft/dressmaker": {
-                "name": "Dressmaker",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/primary": {
+                "icon": "highway-primary",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "lanes",
+                    "surface",
+                    "ref"
                 ],
-                "terms": [
-                    "dress",
-                    "dressmaker"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "dressmaker"
+                    "highway": "primary"
                 },
-                "icon": "clothing-store",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Primary Road"
             },
-            "craft/electrician": {
-                "name": "Electrician",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/primary_link": {
+                "icon": "highway-primary-link",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface",
+                    "ref"
                 ],
-                "terms": [
-                    "electrician"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "electrician"
+                    "highway": "primary_link"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "ramp",
+                    "on ramp",
+                    "off ramp"
+                ],
+                "name": "Primary Link"
             },
-            "craft/gardener": {
-                "name": "Gardener",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/raceway": {
+                "icon": "highway-unclassified",
+                "fields": [
+                    "oneway",
+                    "surface",
+                    "sport_racing",
+                    "structure"
                 ],
-                "terms": [
-                    "gardener",
-                    "landscaper",
-                    "grounds keeper"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "gardener"
+                    "highway": "raceway"
                 },
-                "icon": "garden",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "addTags": {
+                    "highway": "raceway",
+                    "sport": "motor"
+                },
+                "terms": [
+                    "auto*",
+                    "race*",
+                    "nascar"
+                ],
+                "name": "Motor Raceway"
             },
-            "craft/glaziery": {
-                "name": "Glaziery",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/residential": {
+                "icon": "highway-residential",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
                 ],
-                "terms": [
-                    "glass",
-                    "glass foundry",
-                    "stained-glass",
-                    "window"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "glaziery"
+                    "highway": "residential"
                 },
-                "icon": "fire-station",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Residential Road"
             },
-            "craft/handicraft": {
-                "name": "Handicraft",
+            "highway/rest_area": {
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "handicraft"
-                ],
                 "tags": {
-                    "craft": "handicraft"
+                    "highway": "rest_area"
                 },
-                "icon": "art-gallery",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "rest stop"
+                ],
+                "name": "Rest Area"
             },
-            "craft/hvac": {
-                "name": "HVAC",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/road": {
+                "icon": "highway-road",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
                 ],
-                "terms": [
-                    "heating",
-                    "ventilating",
-                    "air-conditioning",
-                    "air conditioning"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "hvac"
+                    "highway": "road"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Unknown Road"
             },
-            "craft/insulator": {
-                "name": "Insulator",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/secondary": {
+                "icon": "highway-secondary",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "lanes",
+                    "surface",
+                    "ref"
                 ],
-                "terms": [
-                    "insulation",
-                    "insulator"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "insulation"
+                    "highway": "secondary"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Secondary Road"
             },
-            "craft/jeweler": {
-                "name": "Jeweler",
+            "highway/secondary_link": {
+                "icon": "highway-secondary-link",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface",
+                    "ref"
+                ],
                 "geometry": [
-                    "point",
-                    "area"
+                    "line"
                 ],
+                "tags": {
+                    "highway": "secondary_link"
+                },
                 "terms": [
-                    "jeweler",
-                    "gem",
-                    "diamond"
+                    "ramp",
+                    "on ramp",
+                    "off ramp"
+                ],
+                "name": "Secondary Link"
+            },
+            "highway/service": {
+                "icon": "highway-service",
+                "fields": [
+                    "service",
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "jeweler"
+                    "highway": "service"
                 },
-                "icon": "marker-stroked",
-                "searchable": false,
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Service Road"
             },
-            "craft/key_cutter": {
-                "name": "Key Cutter",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/service/alley": {
+                "icon": "highway-service",
+                "fields": [
+                    "oneway",
+                    "access",
+                    "surface"
                 ],
-                "terms": [
-                    "key",
-                    "key cutter"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "key_cutter"
+                    "highway": "service",
+                    "service": "alley"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Alley"
             },
-            "craft/locksmith": {
-                "name": "Locksmith",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/service/drive-through": {
+                "icon": "highway-service",
+                "fields": [
+                    "oneway",
+                    "access",
+                    "surface"
                 ],
-                "terms": [
-                    "locksmith",
-                    "lock"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "locksmith"
+                    "highway": "service",
+                    "service": "drive-through"
                 },
-                "icon": "marker-stroked",
-                "searchable": false,
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Drive-Through"
             },
-            "craft/metal_construction": {
-                "name": "Metal Construction",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/service/driveway": {
+                "icon": "highway-service",
+                "fields": [
+                    "oneway",
+                    "access",
+                    "surface"
                 ],
-                "terms": [
-                    "metal construction"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "metal_construction"
+                    "highway": "service",
+                    "service": "driveway"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Driveway"
             },
-            "craft/optician": {
-                "name": "Optician",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/service/emergency_access": {
+                "icon": "highway-service",
+                "fields": [
+                    "oneway",
+                    "access",
+                    "surface"
                 ],
-                "terms": [
-                    "glasses",
-                    "optician"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "optician"
+                    "highway": "service",
+                    "service": "emergency_access"
                 },
-                "icon": "marker-stroked",
-                "searchable": false,
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Emergency Access"
             },
-            "craft/painter": {
-                "name": "Painter",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/service/parking_aisle": {
+                "icon": "highway-service",
+                "fields": [
+                    "oneway",
+                    "access",
+                    "surface"
                 ],
-                "terms": [
-                    "painter"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "painter"
+                    "highway": "service",
+                    "service": "parking_aisle"
                 },
-                "icon": "art-gallery",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Parking Aisle"
             },
-            "craft/photographer": {
-                "name": "Photographer",
+            "highway/services": {
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "photographer"
-                ],
                 "tags": {
-                    "craft": "photographer"
+                    "highway": "services"
                 },
-                "icon": "camera",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "services",
+                    "travel plaza",
+                    "service station"
+                ],
+                "name": "Service Area"
             },
-            "craft/photographic_laboratory": {
-                "name": "Photographic Laboratory",
+            "highway/steps": {
+                "fields": [
+                    "surface",
+                    "lit",
+                    "width",
+                    "access"
+                ],
+                "icon": "highway-steps",
                 "geometry": [
-                    "point",
-                    "area"
+                    "line"
                 ],
+                "tags": {
+                    "highway": "steps"
+                },
                 "terms": [
-                    "photographic laboratory",
-                    "film developer"
+                    "stairs",
+                    "staircase"
+                ],
+                "name": "Steps"
+            },
+            "highway/stop": {
+                "geometry": [
+                    "vertex"
                 ],
                 "tags": {
-                    "craft": "photographic_laboratory"
+                    "highway": "stop"
                 },
-                "icon": "camera",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "stop sign"
+                ],
+                "name": "Stop Sign"
             },
-            "craft/plasterer": {
-                "name": "Plasterer",
+            "highway/street_lamp": {
                 "geometry": [
                     "point",
-                    "area"
-                ],
-                "terms": [
-                    "plasterer"
+                    "vertex"
                 ],
                 "tags": {
-                    "craft": "plasterer"
+                    "highway": "street_lamp"
                 },
-                "icon": "marker-stroked",
                 "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
-            },
-            "craft/plumber": {
-                "name": "Plumber",
-                "geometry": [
-                    "point",
-                    "area"
+                    "lamp_type",
+                    "ref"
                 ],
                 "terms": [
-                    "pumber"
+                    "streetlight",
+                    "street light",
+                    "lamp",
+                    "light",
+                    "gaslight"
+                ],
+                "name": "Street Lamp"
+            },
+            "highway/tertiary": {
+                "icon": "highway-tertiary",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "lanes",
+                    "surface",
+                    "ref"
+                ],
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "plumber"
+                    "highway": "tertiary"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Tertiary Road"
             },
-            "craft/pottery": {
-                "name": "Pottery",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/tertiary_link": {
+                "icon": "highway-tertiary-link",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface",
+                    "ref"
                 ],
-                "terms": [
-                    "pottery",
-                    "potter"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "pottery"
+                    "highway": "tertiary_link"
                 },
-                "icon": "art-gallery",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "ramp",
+                    "on ramp",
+                    "off ramp"
+                ],
+                "name": "Tertiary Link"
             },
-            "craft/rigger": {
-                "name": "Rigger",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/track": {
+                "icon": "highway-track",
+                "fields": [
+                    "surface",
+                    "width",
+                    "structure",
+                    "access",
+                    "incline",
+                    "tracktype",
+                    "smoothness",
+                    "mtb/scale",
+                    "mtb/scale/uphill",
+                    "mtb/scale/imba"
                 ],
-                "terms": [
-                    "rigger"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "rigger"
+                    "highway": "track"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "woods road",
+                    "fire road"
+                ],
+                "name": "Track"
             },
-            "craft/roofer": {
-                "name": "Roofer",
+            "highway/traffic_signals": {
                 "geometry": [
-                    "point",
-                    "area"
-                ],
-                "terms": [
-                    "roofer"
+                    "vertex"
                 ],
                 "tags": {
-                    "craft": "roofer"
+                    "highway": "traffic_signals"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "light",
+                    "stoplight",
+                    "traffic light"
+                ],
+                "name": "Traffic Signals"
             },
-            "craft/saddler": {
-                "name": "Saddler",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/trunk": {
+                "icon": "highway-trunk",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "lanes",
+                    "surface",
+                    "ref"
                 ],
-                "terms": [
-                    "saddler"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "saddler"
+                    "highway": "trunk"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Trunk Road"
             },
-            "craft/sailmaker": {
-                "name": "Sailmaker",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/trunk_link": {
+                "icon": "highway-trunk-link",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface",
+                    "ref"
                 ],
-                "terms": [
-                    "sailmaker"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "sailmaker"
+                    "highway": "trunk_link"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "ramp",
+                    "on ramp",
+                    "off ramp"
+                ],
+                "name": "Trunk Link"
             },
-            "craft/sawmill": {
-                "name": "Sawmill",
+            "highway/turning_circle": {
+                "icon": "circle",
                 "geometry": [
-                    "point",
-                    "area"
-                ],
-                "terms": [
-                    "sawmill",
-                    "lumber"
+                    "vertex"
                 ],
                 "tags": {
-                    "craft": "sawmill"
+                    "highway": "turning_circle"
                 },
-                "icon": "park",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [
+                    "cul-de-sac"
+                ],
+                "name": "Turning Circle"
             },
-            "craft/scaffolder": {
-                "name": "Scaffolder",
-                "geometry": [
-                    "point",
-                    "area"
+            "highway/unclassified": {
+                "icon": "highway-unclassified",
+                "fields": [
+                    "oneway",
+                    "maxspeed",
+                    "structure",
+                    "access",
+                    "surface"
                 ],
-                "terms": [
-                    "scaffolder"
+                "geometry": [
+                    "line"
                 ],
                 "tags": {
-                    "craft": "scaffolder"
+                    "highway": "unclassified"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "terms": [],
+                "name": "Unclassified Road"
             },
-            "craft/sculpter": {
-                "name": "Sculpter",
+            "historic": {
+                "fields": [
+                    "historic"
+                ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "sculpter"
-                ],
                 "tags": {
-                    "craft": "sculpter"
+                    "historic": "*"
                 },
-                "icon": "art-gallery",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Historic Site"
             },
-            "craft/shoemaker": {
-                "name": "Shoemaker",
+            "historic/archaeological_site": {
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "shoe repair",
-                    "shoemaker"
-                ],
                 "tags": {
-                    "craft": "shoemaker"
+                    "historic": "archaeological_site"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Archaeological Site"
             },
-            "craft/stonemason": {
-                "name": "Stonemason",
+            "historic/boundary_stone": {
                 "geometry": [
                     "point",
-                    "area"
-                ],
-                "terms": [
-                    "stonemason",
-                    "masonry"
+                    "vertex"
                 ],
                 "tags": {
-                    "craft": "stonemason"
+                    "historic": "boundary_stone"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Boundary Stone"
             },
-            "craft/sweep": {
-                "name": "Chimney Sweep",
+            "historic/castle": {
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [
-                    "sweep",
-                    "chimney sweep"
-                ],
                 "tags": {
-                    "craft": "sweep"
+                    "historic": "castle"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Castle"
             },
-            "craft/tailor": {
-                "name": "Tailor",
+            "historic/memorial": {
+                "icon": "monument",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "tailor",
-                    "clothes"
-                ],
                 "tags": {
-                    "craft": "tailor"
+                    "historic": "memorial"
                 },
-                "icon": "clothing-store",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Memorial"
             },
-            "craft/tiler": {
-                "name": "Tiler",
+            "historic/monument": {
+                "icon": "monument",
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "tiler"
-                ],
                 "tags": {
-                    "craft": "tiler"
+                    "historic": "monument"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Monument"
             },
-            "craft/tinsmith": {
-                "name": "Tinsmith",
+            "historic/ruins": {
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "tinsmith"
-                ],
                 "tags": {
-                    "craft": "tinsmith"
+                    "historic": "ruins"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Ruins"
             },
-            "craft/upholsterer": {
-                "name": "Upholsterer",
+            "historic/wayside_cross": {
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "upholsterer"
-                ],
                 "tags": {
-                    "craft": "upholsterer"
+                    "historic": "wayside_cross"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Wayside Cross"
             },
-            "craft/watchmaker": {
-                "name": "Watchmaker",
+            "historic/wayside_shrine": {
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "watch",
-                    "watchmaker",
-                    "watch repair"
-                ],
                 "tags": {
-                    "craft": "watchmaker"
+                    "historic": "wayside_shrine"
                 },
-                "icon": "circle-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Wayside Shrine"
             },
-            "craft/window_construction": {
-                "name": "Window Construction",
+            "landuse": {
+                "fields": [
+                    "landuse"
+                ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "window",
-                    "window maker",
-                    "window construction"
-                ],
                 "tags": {
-                    "craft": "window_construction"
+                    "landuse": "*"
                 },
-                "icon": "marker-stroked",
-                "fields": [
-                    "building_area",
-                    "address",
-                    "operator",
-                    "opening_hours"
-                ]
+                "name": "Landuse"
             },
-            "embankment": {
+            "landuse/allotments": {
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "embankment": "yes"
+                    "landuse": "allotments"
                 },
-                "name": "Embankment",
-                "matchScore": 0.2
+                "terms": [],
+                "name": "Allotments"
             },
-            "emergency/ambulance_station": {
-                "fields": [
-                    "operator"
-                ],
+            "landuse/basin": {
                 "geometry": [
-                    "area",
                     "point",
-                    "vertex"
+                    "area"
                 ],
                 "tags": {
-                    "emergency": "ambulance_station"
+                    "landuse": "basin"
                 },
-                "name": "Ambulance Station"
+                "terms": [],
+                "name": "Basin"
             },
-            "emergency/fire_hydrant": {
+            "landuse/cemetery": {
+                "icon": "cemetery",
                 "fields": [
-                    "fire_hydrant/type"
+                    "religion",
+                    "denomination"
                 ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
-                    "emergency": "fire_hydrant"
+                    "landuse": "cemetery"
                 },
-                "name": "Fire Hydrant"
+                "terms": [],
+                "name": "Cemetery"
             },
-            "emergency/phone": {
-                "icon": "emergency-telephone",
+            "landuse/churchyard": {
                 "fields": [
-                    "operator"
+                    "religion",
+                    "denomination"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex"
+                    "area"
                 ],
                 "tags": {
-                    "emergency": "phone"
+                    "landuse": "churchyard"
                 },
-                "name": "Emergency Phone"
+                "terms": [],
+                "name": "Churchyard"
             },
-            "entrance": {
-                "icon": "entrance",
+            "landuse/commercial": {
+                "icon": "commercial",
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "entrance": "*"
+                    "landuse": "commercial"
                 },
-                "fields": [
-                    "entrance",
-                    "access_simple",
-                    "address"
-                ],
-                "name": "Entrance"
+                "terms": [],
+                "name": "Commercial"
             },
-            "footway/crossing": {
+            "landuse/construction": {
                 "fields": [
-                    "crossing",
-                    "access",
-                    "surface"
+                    "construction",
+                    "operator"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "footway",
-                    "footway": "crossing"
+                    "landuse": "construction"
                 },
-                "terms": [
-                    "crosswalk",
-                    "zebra crossing"
-                ],
-                "name": "Crossing"
+                "terms": [],
+                "name": "Construction"
             },
-            "footway/sidewalk": {
+            "landuse/farm": {
                 "fields": [
-                    "surface",
-                    "lit",
-                    "access"
+                    "crop"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "footway",
-                    "footway": "sidewalk"
+                    "landuse": "farm"
                 },
                 "terms": [],
-                "name": "Sidewalk"
+                "name": "Farm",
+                "icon": "farm"
             },
-            "golf/bunker": {
-                "icon": "golf",
+            "landuse/farmland": {
+                "fields": [
+                    "crop"
+                ],
                 "geometry": [
+                    "point",
                     "area"
                 ],
                 "tags": {
-                    "golf": "bunker",
-                    "natural": "sand"
+                    "landuse": "farmland"
                 },
-                "terms": [
-                    "hazard",
-                    "bunker"
-                ],
-                "name": "Sand Trap"
+                "terms": [],
+                "name": "Farmland",
+                "icon": "farm",
+                "searchable": false
             },
-            "golf/fairway": {
-                "icon": "golf",
+            "landuse/farmyard": {
+                "fields": [
+                    "crop"
+                ],
                 "geometry": [
+                    "point",
                     "area"
                 ],
                 "tags": {
-                    "golf": "fairway",
-                    "landuse": "grass"
+                    "landuse": "farmyard"
                 },
-                "name": "Fairway"
+                "terms": [],
+                "name": "Farmyard",
+                "icon": "farm"
             },
-            "golf/green": {
-                "icon": "golf",
+            "landuse/forest": {
+                "fields": [
+                    "wood"
+                ],
+                "icon": "park2",
                 "geometry": [
+                    "point",
                     "area"
                 ],
                 "tags": {
-                    "golf": "green",
-                    "landuse": "grass",
-                    "leisure": "pitch",
-                    "sport": "golf"
+                    "landuse": "forest"
                 },
-                "terms": [
-                    "putting green"
-                ],
-                "name": "Putting Green"
+                "terms": [],
+                "name": "Forest"
             },
-            "golf/hole": {
-                "icon": "golf",
-                "fields": [
-                    "golf_hole",
-                    "par",
-                    "handicap"
-                ],
+            "landuse/grass": {
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "golf": "hole"
+                    "landuse": "grass"
                 },
-                "name": "Golf Hole"
+                "terms": [],
+                "name": "Grass"
             },
-            "golf/lateral_water_hazard": {
-                "icon": "golf",
+            "landuse/industrial": {
+                "icon": "industrial",
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
                 "tags": {
-                    "golf": "lateral_water_hazard",
-                    "natural": "water"
+                    "landuse": "industrial"
                 },
-                "name": "Lateral Water Hazard"
+                "terms": [],
+                "name": "Industrial"
             },
-            "golf/rough": {
-                "icon": "golf",
+            "landuse/landfill": {
                 "geometry": [
                     "area"
                 ],
                 "tags": {
-                    "golf": "rough",
-                    "landuse": "grass"
+                    "landuse": "landfill"
                 },
-                "name": "Rough"
+                "terms": [
+                    "dump"
+                ],
+                "name": "Landfill"
             },
-            "golf/tee": {
-                "icon": "golf",
+            "landuse/meadow": {
                 "geometry": [
+                    "point",
                     "area"
                 ],
                 "tags": {
-                    "golf": "tee",
-                    "landuse": "grass"
+                    "landuse": "meadow"
                 },
-                "terms": [
-                    "teeing ground"
-                ],
-                "name": "Tee Box"
+                "terms": [],
+                "name": "Meadow"
             },
-            "golf/water_hazard": {
-                "icon": "golf",
+            "landuse/military": {
                 "geometry": [
-                    "line",
                     "area"
                 ],
                 "tags": {
-                    "golf": "water_hazard",
-                    "natural": "water"
+                    "landuse": "military"
                 },
-                "name": "Water Hazard"
+                "terms": [],
+                "name": "Military"
             },
-            "highway": {
+            "landuse/orchard": {
                 "fields": [
-                    "highway"
+                    "trees"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line",
                     "area"
                 ],
                 "tags": {
-                    "highway": "*"
+                    "landuse": "orchard"
                 },
-                "name": "Highway"
+                "terms": [],
+                "name": "Orchard",
+                "icon": "park2"
             },
-            "highway/bridleway": {
-                "fields": [
-                    "access",
-                    "surface",
-                    "structure"
-                ],
-                "icon": "highway-bridleway",
+            "landuse/quarry": {
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "bridleway"
+                    "landuse": "quarry"
                 },
-                "terms": [
-                    "bridleway",
-                    "equestrian trail",
-                    "horse riding path",
-                    "bridle road",
-                    "horse trail"
-                ],
-                "name": "Bridle Path"
+                "terms": [],
+                "name": "Quarry"
             },
-            "highway/bus_stop": {
-                "icon": "bus",
-                "fields": [
-                    "operator",
-                    "shelter"
-                ],
+            "landuse/residential": {
+                "icon": "building",
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
                 "tags": {
-                    "highway": "bus_stop"
+                    "landuse": "residential"
                 },
                 "terms": [],
-                "name": "Bus Stop"
+                "name": "Residential"
             },
-            "highway/crossing": {
-                "fields": [
-                    "crossing"
-                ],
+            "landuse/retail": {
+                "icon": "shop",
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "crossing"
+                    "landuse": "retail"
                 },
-                "terms": [
-                    "crosswalk",
-                    "zebra crossing"
-                ],
-                "name": "Crossing"
+                "name": "Retail"
             },
-            "highway/cycleway": {
-                "icon": "highway-cycleway",
-                "fields": [
-                    "surface",
-                    "lit",
-                    "structure",
-                    "access",
-                    "oneway"
-                ],
+            "landuse/vineyard": {
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "cycleway"
+                    "landuse": "vineyard"
                 },
                 "terms": [],
-                "name": "Cycle Path"
+                "name": "Vineyard"
             },
-            "highway/footway": {
-                "icon": "highway-footway",
+            "leisure": {
                 "fields": [
-                    "structure",
-                    "access",
-                    "surface"
+                    "leisure"
                 ],
                 "geometry": [
-                    "line",
+                    "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "beaten path",
-                    "boulevard",
-                    "clearing",
-                    "course",
-                    "cut*",
-                    "drag*",
-                    "footpath",
-                    "highway",
-                    "lane",
-                    "line",
-                    "orbit",
-                    "passage",
-                    "pathway",
-                    "rail",
-                    "rails",
-                    "road",
-                    "roadway",
-                    "route",
-                    "street",
-                    "thoroughfare",
-                    "trackway",
-                    "trail",
-                    "trajectory",
-                    "walk"
-                ],
                 "tags": {
-                    "highway": "footway"
+                    "leisure": "*"
                 },
-                "name": "Foot Path"
+                "name": "Leisure"
             },
-            "highway/living_street": {
-                "icon": "highway-living-street",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface"
-                ],
+            "leisure/common": {
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "open space"
                 ],
                 "tags": {
-                    "highway": "living_street"
+                    "leisure": "common"
                 },
-                "name": "Living Street"
+                "name": "Common"
             },
-            "highway/mini_roundabout": {
+            "leisure/dog_park": {
+                "icon": "dog-park",
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "highway": "mini_roundabout"
+                    "leisure": "dog_park"
                 },
-                "fields": [
-                    "clock_direction"
-                ],
-                "name": "Mini-Roundabout"
+                "name": "Dog Park"
             },
-            "highway/motorway": {
-                "icon": "highway-motorway",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "lanes",
-                    "surface",
-                    "ref"
-                ],
+            "leisure/firepit": {
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "motorway"
+                    "leisure": "firepit"
                 },
-                "terms": [],
-                "name": "Motorway"
+                "terms": [
+                    "fireplace",
+                    "campfire"
+                ],
+                "name": "Firepit"
             },
-            "highway/motorway_junction": {
+            "leisure/garden": {
+                "icon": "garden",
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "motorway_junction"
+                    "leisure": "garden"
                 },
-                "fields": [
-                    "ref"
-                ],
-                "name": "Motorway Junction"
+                "name": "Garden"
             },
-            "highway/motorway_link": {
-                "icon": "highway-motorway-link",
+            "leisure/golf_course": {
+                "icon": "golf",
                 "fields": [
-                    "oneway_yes",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface",
-                    "ref"
+                    "operator",
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
-                "tags": {
-                    "highway": "motorway_link"
-                },
                 "terms": [
-                    "ramp",
-                    "on ramp",
-                    "off ramp"
+                    "links"
                 ],
-                "name": "Motorway Link"
+                "tags": {
+                    "leisure": "golf_course"
+                },
+                "name": "Golf Course"
             },
-            "highway/path": {
-                "icon": "highway-path",
+            "leisure/ice_rink": {
+                "icon": "pitch",
                 "fields": [
-                    "structure",
-                    "access",
-                    "sac_scale",
-                    "surface",
-                    "incline",
-                    "trail_visibility",
-                    "ref"
+                    "seasonal",
+                    "sport_ice",
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "hockey",
+                    "skating",
+                    "curling"
                 ],
                 "tags": {
-                    "highway": "path"
+                    "leisure": "ice_rink"
                 },
-                "terms": [],
-                "name": "Path"
+                "name": "Ice Rink"
             },
-            "highway/pedestrian": {
-                "fields": [
-                    "access",
-                    "oneway",
-                    "surface"
-                ],
+            "leisure/marina": {
+                "icon": "harbor",
                 "geometry": [
-                    "line",
+                    "point",
+                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "boat"
+                ],
                 "tags": {
-                    "highway": "pedestrian"
+                    "leisure": "marina"
                 },
-                "terms": [],
-                "name": "Pedestrian"
+                "name": "Marina"
             },
-            "highway/primary": {
-                "icon": "highway-primary",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "lanes",
-                    "surface",
-                    "ref"
-                ],
+            "leisure/park": {
+                "icon": "park",
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "esplanade",
+                    "estate",
+                    "forest",
+                    "garden",
+                    "grass",
+                    "green",
+                    "grounds",
+                    "lawn",
+                    "lot",
+                    "meadow",
+                    "parkland",
+                    "place",
+                    "playground",
+                    "plaza",
+                    "pleasure garden",
+                    "recreation area",
+                    "square",
+                    "tract",
+                    "village green",
+                    "woodland"
                 ],
                 "tags": {
-                    "highway": "primary"
+                    "leisure": "park"
                 },
-                "terms": [],
-                "name": "Primary Road"
+                "name": "Park"
             },
-            "highway/primary_link": {
-                "icon": "highway-primary-link",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface",
-                    "ref"
-                ],
+            "leisure/picnic_table": {
                 "geometry": [
-                    "line"
+                    "point"
                 ],
                 "tags": {
-                    "highway": "primary_link"
+                    "leisure": "picnic_table"
                 },
                 "terms": [
-                    "ramp",
-                    "on ramp",
-                    "off ramp"
+                    "bench"
                 ],
-                "name": "Primary Link"
+                "name": "Picnic Table"
             },
-            "highway/residential": {
-                "icon": "highway-residential",
+            "leisure/pitch": {
+                "icon": "pitch",
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface"
+                    "sport",
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "residential"
+                    "leisure": "pitch"
                 },
-                "terms": [],
-                "name": "Residential Road"
+                "terms": [
+                    "field"
+                ],
+                "name": "Sport Pitch"
             },
-            "highway/rest_area": {
+            "leisure/pitch/american_football": {
+                "icon": "america-football",
+                "fields": [
+                    "surface",
+                    "lit"
+                ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "highway": "rest_area"
+                    "leisure": "pitch",
+                    "sport": "american_football"
                 },
-                "terms": [
-                    "rest stop",
-                    "turnout",
-                    "lay-by"
-                ],
-                "name": "Rest Area"
+                "terms": [],
+                "name": "American Football Field"
             },
-            "highway/road": {
-                "icon": "highway-road",
+            "leisure/pitch/baseball": {
+                "icon": "baseball",
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface"
+                    "lit"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "road"
+                    "leisure": "pitch",
+                    "sport": "baseball"
                 },
                 "terms": [],
-                "name": "Unknown Road"
+                "name": "Baseball Diamond"
             },
-            "highway/secondary": {
-                "icon": "highway-secondary",
+            "leisure/pitch/basketball": {
+                "icon": "basketball",
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "lanes",
                     "surface",
-                    "ref"
+                    "hoops",
+                    "lit"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "secondary"
+                    "leisure": "pitch",
+                    "sport": "basketball"
                 },
                 "terms": [],
-                "name": "Secondary Road"
+                "name": "Basketball Court"
             },
-            "highway/secondary_link": {
-                "icon": "highway-secondary-link",
+            "leisure/pitch/skateboard": {
+                "icon": "pitch",
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
                     "surface",
-                    "ref"
+                    "lit"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "secondary_link"
+                    "leisure": "pitch",
+                    "sport": "skateboard"
                 },
-                "terms": [
-                    "ramp",
-                    "on ramp",
-                    "off ramp"
-                ],
-                "name": "Secondary Link"
+                "terms": [],
+                "name": "Skate Park"
             },
-            "highway/service": {
-                "icon": "highway-service",
+            "leisure/pitch/soccer": {
+                "icon": "soccer",
                 "fields": [
-                    "service",
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "service"
+                    "leisure": "pitch",
+                    "sport": "soccer"
                 },
                 "terms": [],
-                "name": "Service Road"
+                "name": "Soccer Field"
             },
-            "highway/service/alley": {
-                "icon": "highway-service",
+            "leisure/pitch/tennis": {
+                "icon": "tennis",
                 "fields": [
-                    "oneway",
-                    "access",
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "service",
-                    "service": "alley"
+                    "leisure": "pitch",
+                    "sport": "tennis"
                 },
-                "name": "Alley"
+                "terms": [],
+                "name": "Tennis Court"
             },
-            "highway/service/drive-through": {
-                "icon": "highway-service",
+            "leisure/pitch/volleyball": {
+                "icon": "pitch",
                 "fields": [
-                    "oneway",
-                    "access",
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "service",
-                    "service": "drive-through"
+                    "leisure": "pitch",
+                    "sport": "volleyball"
                 },
-                "name": "Drive-Through"
+                "terms": [],
+                "name": "Volleyball Court"
             },
-            "highway/service/driveway": {
-                "icon": "highway-service",
-                "fields": [
-                    "oneway",
-                    "access",
-                    "surface"
-                ],
+            "leisure/playground": {
+                "icon": "playground",
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "jungle gym",
+                    "play area"
                 ],
                 "tags": {
-                    "highway": "service",
-                    "service": "driveway"
+                    "leisure": "playground"
                 },
-                "name": "Driveway"
+                "name": "Playground"
             },
-            "highway/service/emergency_access": {
-                "icon": "highway-service",
+            "leisure/running_track": {
+                "icon": "pitch",
                 "fields": [
-                    "oneway",
-                    "access",
-                    "surface"
+                    "surface",
+                    "sport_racing",
+                    "lit",
+                    "width",
+                    "lanes"
                 ],
                 "geometry": [
+                    "point",
                     "line"
                 ],
                 "tags": {
-                    "highway": "service",
-                    "service": "emergency_access"
+                    "leisure": "track",
+                    "sport": "running"
                 },
-                "name": "Emergency Access"
+                "name": "Running Track"
             },
-            "highway/service/parking_aisle": {
-                "icon": "highway-service",
-                "fields": [
-                    "oneway",
-                    "access",
-                    "surface"
-                ],
+            "leisure/slipway": {
                 "geometry": [
+                    "point",
                     "line"
                 ],
+                "terms": [
+                    "boat launch",
+                    "boat ramp"
+                ],
                 "tags": {
-                    "highway": "service",
-                    "service": "parking_aisle"
+                    "leisure": "slipway"
                 },
-                "name": "Parking Aisle"
+                "name": "Slipway"
             },
-            "highway/services": {
+            "leisure/sports_center": {
+                "icon": "pitch",
+                "fields": [
+                    "sport",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "highway": "services"
+                    "leisure": "sports_centre"
                 },
                 "terms": [
-                    "services",
-                    "travel plaza",
-                    "service station"
+                    "gym"
                 ],
-                "name": "Service Area"
+                "name": "Sports Center / Gym"
             },
-            "highway/steps": {
+            "leisure/stadium": {
+                "icon": "pitch",
                 "fields": [
-                    "access",
-                    "surface"
+                    "sport",
+                    "address"
                 ],
-                "icon": "highway-steps",
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "steps"
+                    "leisure": "stadium"
                 },
-                "terms": [
-                    "stairs",
-                    "staircase"
-                ],
-                "name": "Steps"
+                "name": "Stadium"
             },
-            "highway/stop": {
+            "leisure/swimming_pool": {
+                "icon": "swimming",
+                "fields": [
+                    "access_simple",
+                    "operator",
+                    "address"
+                ],
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "stop"
+                    "leisure": "swimming_pool"
                 },
-                "terms": [
-                    "stop sign"
-                ],
-                "name": "Stop Sign"
+                "name": "Swimming Pool"
             },
-            "highway/tertiary": {
-                "icon": "highway-tertiary",
+            "leisure/track": {
+                "icon": "highway-road",
                 "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "lanes",
                     "surface",
-                    "ref"
+                    "sport_racing",
+                    "lit",
+                    "width",
+                    "lanes"
                 ],
                 "geometry": [
+                    "point",
                     "line"
                 ],
                 "tags": {
-                    "highway": "tertiary"
+                    "leisure": "track"
                 },
-                "terms": [],
-                "name": "Tertiary Road"
+                "name": "Racetrack (non-Motorsport)"
             },
-            "highway/tertiary_link": {
-                "icon": "highway-tertiary-link",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface",
-                    "ref"
-                ],
+            "line": {
+                "name": "Line",
+                "tags": {},
                 "geometry": [
                     "line"
                 ],
-                "tags": {
-                    "highway": "tertiary_link"
-                },
-                "terms": [
-                    "ramp",
-                    "on ramp",
-                    "off ramp"
-                ],
-                "name": "Tertiary Link"
+                "matchScore": 0.1
             },
-            "highway/track": {
-                "icon": "highway-track",
+            "man_made": {
                 "fields": [
-                    "tracktype",
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface"
+                    "man_made"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "line",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "track"
+                    "man_made": "*"
                 },
-                "terms": [],
-                "name": "Track"
+                "name": "Man Made"
             },
-            "highway/traffic_signals": {
+            "man_made/breakwater": {
                 "geometry": [
-                    "vertex"
+                    "line",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "traffic_signals"
+                    "man_made": "breakwater"
                 },
-                "terms": [
-                    "light",
-                    "stoplight",
-                    "traffic light"
-                ],
-                "name": "Traffic Signals"
+                "name": "Breakwater"
             },
-            "highway/trunk": {
-                "icon": "highway-trunk",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "lanes",
-                    "surface",
-                    "ref"
-                ],
+            "man_made/cutline": {
                 "geometry": [
                     "line"
                 ],
                 "tags": {
-                    "highway": "trunk"
+                    "man_made": "cutline"
                 },
-                "terms": [],
-                "name": "Trunk Road"
+                "name": "Cut line"
             },
-            "highway/trunk_link": {
-                "icon": "highway-trunk-link",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface",
-                    "ref"
-                ],
+            "man_made/embankment": {
                 "geometry": [
                     "line"
                 ],
                 "tags": {
-                    "highway": "trunk_link"
+                    "man_made": "embankment"
                 },
-                "terms": [
-                    "ramp",
-                    "on ramp",
-                    "off ramp"
-                ],
-                "name": "Trunk Link"
+                "name": "Embankment",
+                "searchable": false
             },
-            "highway/turning_circle": {
-                "icon": "circle",
+            "man_made/flagpole": {
                 "geometry": [
-                    "vertex"
+                    "point"
                 ],
                 "tags": {
-                    "highway": "turning_circle"
+                    "man_made": "flagpole"
                 },
-                "terms": [],
-                "name": "Turning Circle"
+                "name": "Flagpole",
+                "icon": "embassy"
             },
-            "highway/unclassified": {
-                "icon": "highway-unclassified",
-                "fields": [
-                    "oneway",
-                    "maxspeed",
-                    "structure",
-                    "access",
-                    "surface"
-                ],
+            "man_made/lighthouse": {
+                "icon": "lighthouse",
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "highway": "unclassified"
+                    "man_made": "lighthouse"
                 },
-                "terms": [],
-                "name": "Unclassified Road"
+                "name": "Lighthouse"
             },
-            "historic": {
-                "fields": [
-                    "historic"
-                ],
+            "man_made/observation": {
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "lookout tower",
+                    "fire tower"
+                ],
                 "tags": {
-                    "historic": "*"
+                    "man_made": "tower",
+                    "tower:type": "observation"
                 },
-                "name": "Historic Site"
+                "name": "Observation Tower"
             },
-            "historic/archaeological_site": {
+            "man_made/pier": {
                 "geometry": [
-                    "point",
-                    "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "historic": "archaeological_site"
+                    "man_made": "pier"
                 },
-                "name": "Archaeological Site"
+                "name": "Pier"
             },
-            "historic/boundary_stone": {
+            "man_made/pipeline": {
+                "icon": "pipeline",
+                "fields": [
+                    "location",
+                    "operator"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "man_made": "pipeline"
+                },
+                "name": "Pipeline"
+            },
+            "man_made/survey_point": {
+                "icon": "monument",
+                "fields": [
+                    "ref"
+                ],
                 "geometry": [
                     "point",
                     "vertex"
                 ],
                 "tags": {
-                    "historic": "boundary_stone"
+                    "man_made": "survey_point"
                 },
-                "name": "Boundary Stone"
+                "name": "Survey Point"
             },
-            "historic/castle": {
+            "man_made/tower": {
+                "fields": [
+                    "towertype"
+                ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "historic": "castle"
+                    "man_made": "tower"
                 },
-                "name": "Castle"
+                "name": "Tower"
             },
-            "historic/memorial": {
-                "icon": "monument",
+            "man_made/wastewater_plant": {
+                "icon": "water",
+                "fields": [
+                    "operator",
+                    "address"
+                ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "sewage*",
+                    "water treatment plant",
+                    "reclamation plant"
+                ],
                 "tags": {
-                    "historic": "memorial"
+                    "man_made": "wastewater_plant"
                 },
-                "name": "Memorial"
+                "name": "Wastewater Plant"
             },
-            "historic/monument": {
-                "icon": "monument",
+            "man_made/water_tower": {
+                "icon": "water",
+                "fields": [
+                    "operator"
+                ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "historic": "monument"
+                    "man_made": "water_tower"
                 },
-                "name": "Monument"
+                "name": "Water Tower"
             },
-            "historic/ruins": {
+            "man_made/water_well": {
+                "fields": [
+                    "operator"
+                ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "historic": "ruins"
+                    "man_made": "water_well"
                 },
-                "name": "Ruins"
+                "name": "Water Well"
             },
-            "historic/wayside_cross": {
+            "man_made/water_works": {
+                "icon": "water",
+                "fields": [
+                    "operator",
+                    "address"
+                ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "historic": "wayside_cross"
+                    "man_made": "water_works"
                 },
-                "name": "Wayside Cross"
+                "name": "Water Works"
             },
-            "historic/wayside_shrine": {
+            "military/airfield": {
+                "icon": "airfield",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "historic": "wayside_shrine"
+                    "military": "airfield"
                 },
-                "name": "Wayside Shrine"
+                "name": "Airfield"
             },
-            "landuse": {
-                "fields": [
-                    "landuse"
-                ],
+            "military/barracks": {
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "*"
+                    "military": "barracks"
                 },
-                "name": "Landuse"
+                "name": "Barracks"
             },
-            "landuse/allotments": {
+            "military/bunker": {
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "allotments"
+                    "military": "bunker"
                 },
-                "terms": [],
-                "name": "Allotments"
+                "name": "Bunker"
             },
-            "landuse/basin": {
+            "military/range": {
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "basin"
+                    "military": "range"
                 },
-                "terms": [],
-                "name": "Basin"
+                "name": "Military Range"
             },
-            "landuse/cemetery": {
-                "icon": "cemetery",
+            "natural": {
                 "fields": [
-                    "religion",
-                    "denomination"
+                    "natural"
                 ],
                 "geometry": [
                     "point",
@@ -67128,546 +72060,603 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "landuse": "cemetery"
+                    "natural": "*"
                 },
-                "terms": [],
-                "name": "Cemetery"
+                "name": "Natural"
             },
-            "landuse/commercial": {
+            "natural/bay": {
                 "geometry": [
                     "point",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "commercial"
+                    "natural": "bay"
                 },
-                "terms": [],
-                "name": "Commercial"
+                "name": "Bay"
             },
-            "landuse/construction": {
+            "natural/beach": {
                 "fields": [
-                    "construction",
-                    "operator"
+                    "surface"
                 ],
                 "geometry": [
                     "point",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "construction"
+                    "natural": "beach"
                 },
-                "terms": [],
-                "name": "Construction"
+                "name": "Beach"
             },
-            "landuse/farm": {
-                "fields": [
-                    "crop"
-                ],
+            "natural/cliff": {
                 "geometry": [
                     "point",
+                    "vertex",
+                    "line",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "farm"
+                    "natural": "cliff"
                 },
-                "terms": [],
-                "name": "Farm",
-                "icon": "farm"
+                "name": "Cliff"
             },
-            "landuse/farmland": {
-                "fields": [
-                    "crop"
+            "natural/coastline": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "shore"
                 ],
+                "tags": {
+                    "natural": "coastline"
+                },
+                "name": "Coastline"
+            },
+            "natural/fell": {
                 "geometry": [
-                    "point",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "farmland"
+                    "natural": "fell"
                 },
-                "terms": [],
-                "name": "Farmland",
-                "icon": "farm",
-                "searchable": false
+                "name": "Fell"
             },
-            "landuse/farmyard": {
-                "fields": [
-                    "crop"
-                ],
+            "natural/glacier": {
                 "geometry": [
-                    "point",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "farmyard"
+                    "natural": "glacier"
                 },
-                "terms": [],
-                "name": "Farmyard",
-                "icon": "farm"
+                "name": "Glacier"
             },
-            "landuse/forest": {
-                "fields": [
-                    "wood"
-                ],
-                "icon": "park2",
+            "natural/grassland": {
                 "geometry": [
                     "point",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "forest"
+                    "natural": "grassland"
                 },
-                "terms": [],
-                "name": "Forest"
+                "name": "Grassland"
             },
-            "landuse/grass": {
+            "natural/heath": {
                 "geometry": [
-                    "point",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "grass"
+                    "natural": "heath"
                 },
-                "terms": [],
-                "name": "Grass"
+                "name": "Heath"
             },
-            "landuse/industrial": {
-                "icon": "industrial",
+            "natural/peak": {
+                "icon": "triangle",
+                "fields": [
+                    "elevation"
+                ],
                 "geometry": [
                     "point",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
-                    "landuse": "industrial"
+                    "natural": "peak"
                 },
-                "terms": [],
-                "name": "Industrial"
+                "terms": [
+                    "acme",
+                    "aiguille",
+                    "alp",
+                    "climax",
+                    "crest",
+                    "crown",
+                    "hill",
+                    "mount",
+                    "mountain",
+                    "pinnacle",
+                    "summit",
+                    "tip",
+                    "top"
+                ],
+                "name": "Peak"
             },
-            "landuse/landfill": {
+            "natural/scree": {
                 "geometry": [
                     "area"
                 ],
                 "tags": {
-                    "landuse": "landfill"
+                    "natural": "scree"
                 },
                 "terms": [
-                    "dump"
+                    "loose rocks"
                 ],
-                "name": "Landfill"
+                "name": "Scree"
+            },
+            "natural/scrub": {
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "natural": "scrub"
+                },
+                "terms": [],
+                "name": "Scrub"
             },
-            "landuse/meadow": {
+            "natural/spring": {
                 "geometry": [
                     "point",
-                    "area"
+                    "vertex"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "meadow"
+                    "natural": "spring"
                 },
-                "terms": [],
-                "name": "Meadow"
+                "name": "Spring"
             },
-            "landuse/orchard": {
+            "natural/tree": {
                 "fields": [
-                    "trees"
+                    "tree_type",
+                    "denotation"
                 ],
+                "icon": "park",
                 "geometry": [
                     "point",
-                    "area"
+                    "vertex"
                 ],
+                "terms": [],
                 "tags": {
-                    "landuse": "orchard"
+                    "natural": "tree"
                 },
-                "terms": [],
-                "name": "Orchard",
-                "icon": "park2"
+                "name": "Tree"
             },
-            "landuse/quarry": {
+            "natural/water": {
+                "fields": [
+                    "water"
+                ],
                 "geometry": [
-                    "point",
                     "area"
                 ],
                 "tags": {
-                    "landuse": "quarry"
+                    "natural": "water"
                 },
-                "terms": [],
-                "name": "Quarry"
+                "icon": "water",
+                "name": "Water"
             },
-            "landuse/residential": {
+            "natural/water/lake": {
                 "geometry": [
-                    "point",
                     "area"
                 ],
                 "tags": {
-                    "landuse": "residential"
+                    "natural": "water",
+                    "water": "lake"
                 },
-                "terms": [],
-                "name": "Residential"
+                "terms": [
+                    "lakelet",
+                    "loch",
+                    "mere"
+                ],
+                "icon": "water",
+                "name": "Lake"
             },
-            "landuse/retail": {
-                "icon": "shop",
+            "natural/water/pond": {
                 "geometry": [
-                    "point",
                     "area"
                 ],
                 "tags": {
-                    "landuse": "retail"
+                    "natural": "water",
+                    "water": "pond"
                 },
-                "name": "Retail"
+                "terms": [
+                    "lakelet",
+                    "millpond",
+                    "tarn",
+                    "pool",
+                    "mere"
+                ],
+                "icon": "water",
+                "name": "Pond"
             },
-            "landuse/vineyard": {
+            "natural/water/reservoir": {
                 "geometry": [
-                    "point",
                     "area"
                 ],
                 "tags": {
-                    "landuse": "vineyard"
+                    "natural": "water",
+                    "water": "reservoir"
                 },
-                "terms": [],
-                "name": "Vineyard"
+                "icon": "water",
+                "name": "Reservoir"
             },
-            "leisure": {
+            "natural/wetland": {
+                "icon": "wetland",
                 "fields": [
-                    "leisure"
+                    "wetland"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "*"
+                    "natural": "wetland"
                 },
-                "name": "Leisure"
+                "terms": [],
+                "name": "Wetland"
             },
-            "leisure/common": {
+            "natural/wood": {
+                "fields": [
+                    "wood"
+                ],
+                "icon": "park2",
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [
-                    "open space"
-                ],
                 "tags": {
-                    "leisure": "common"
+                    "natural": "wood"
                 },
-                "name": "Common"
+                "terms": [],
+                "name": "Wood"
             },
-            "leisure/dog_park": {
+            "office": {
+                "icon": "commercial",
+                "fields": [
+                    "office",
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "smoking"
+                ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
-                    "leisure": "dog_park"
+                    "office": "*"
                 },
-                "name": "Dog Park",
-                "icon": "dog-park"
+                "terms": [],
+                "name": "Office"
             },
-            "leisure/firepit": {
+            "office/accountant": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "firepit"
+                    "office": "accountant"
                 },
-                "terms": [
-                    "fireplace",
-                    "campfire"
-                ],
-                "name": "Firepit"
+                "terms": [],
+                "name": "Accountant"
             },
-            "leisure/garden": {
-                "icon": "garden",
+            "office/administrative": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "garden"
+                    "office": "administrative"
                 },
-                "name": "Garden"
+                "terms": [],
+                "name": "Administrative Office"
             },
-            "leisure/golf_course": {
-                "icon": "golf",
+            "office/architect": {
+                "icon": "commercial",
                 "fields": [
-                    "operator",
-                    "address"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "golf_course"
+                    "office": "architect"
                 },
-                "terms": [
-                    "links"
-                ],
-                "name": "Golf Course"
+                "terms": [],
+                "name": "Architect"
             },
-            "leisure/ice_rink": {
-                "icon": "pitch",
+            "office/company": {
+                "icon": "commercial",
                 "fields": [
+                    "address",
                     "building_area",
-                    "seasonal",
-                    "sport_ice"
+                    "opening_hours",
+                    "smoking"
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "hockey",
-                    "skating",
-                    "curling"
-                ],
                 "tags": {
-                    "leisure": "ice_rink"
+                    "office": "company"
                 },
-                "name": "Ice Rink"
+                "terms": [],
+                "name": "Company Office"
             },
-            "leisure/marina": {
-                "icon": "harbor",
+            "office/educational_institution": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "marina"
+                    "office": "educational_institution"
                 },
-                "name": "Marina"
+                "terms": [],
+                "name": "Educational Institution"
             },
-            "leisure/park": {
-                "icon": "park",
+            "office/employment_agency": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "esplanade",
-                    "estate",
-                    "forest",
-                    "garden",
-                    "grass",
-                    "green",
-                    "grounds",
-                    "lawn",
-                    "lot",
-                    "meadow",
-                    "parkland",
-                    "place",
-                    "playground",
-                    "plaza",
-                    "pleasure garden",
-                    "recreation area",
-                    "square",
-                    "tract",
-                    "village green",
-                    "woodland"
-                ],
-                "tags": {
-                    "leisure": "park"
-                },
-                "name": "Park"
-            },
-            "leisure/picnic_table": {
-                "geometry": [
-                    "point"
-                ],
                 "tags": {
-                    "leisure": "picnic_table"
+                    "office": "employment_agency"
                 },
                 "terms": [
-                    "bench",
-                    "table"
+                    "job"
                 ],
-                "name": "Picnic Table"
+                "name": "Employment Agency"
             },
-            "leisure/pitch": {
-                "icon": "pitch",
+            "office/estate_agent": {
+                "icon": "commercial",
                 "fields": [
-                    "sport",
-                    "surface"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch"
+                    "office": "estate_agent"
                 },
                 "terms": [],
-                "name": "Sport Pitch"
+                "name": "Real Estate Office"
             },
-            "leisure/pitch/american_football": {
-                "icon": "america-football",
+            "office/financial": {
+                "icon": "commercial",
                 "fields": [
-                    "surface"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "american_football"
+                    "office": "financial"
                 },
                 "terms": [],
-                "name": "American Football Field"
+                "name": "Financial Office"
             },
-            "leisure/pitch/baseball": {
-                "icon": "baseball",
+            "office/government": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "baseball"
+                    "office": "government"
                 },
                 "terms": [],
-                "name": "Baseball Diamond"
+                "name": "Government Office"
             },
-            "leisure/pitch/basketball": {
-                "icon": "basketball",
+            "office/insurance": {
+                "icon": "commercial",
                 "fields": [
-                    "surface",
-                    "hoops"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "basketball"
+                    "office": "insurance"
                 },
                 "terms": [],
-                "name": "Basketball Court"
+                "name": "Insurance Office"
             },
-            "leisure/pitch/skateboard": {
-                "icon": "pitch",
+            "office/it": {
+                "icon": "commercial",
                 "fields": [
-                    "surface"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "skateboard"
+                    "office": "it"
                 },
                 "terms": [],
-                "name": "Skate Park"
+                "name": "IT Office"
             },
-            "leisure/pitch/soccer": {
-                "icon": "soccer",
+            "office/lawyer": {
+                "icon": "commercial",
                 "fields": [
-                    "surface"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "soccer"
+                    "office": "lawyer"
                 },
                 "terms": [],
-                "name": "Soccer Field"
+                "name": "Law Office"
             },
-            "leisure/pitch/tennis": {
-                "icon": "tennis",
+            "office/newspaper": {
+                "icon": "commercial",
                 "fields": [
-                    "surface"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "tennis"
+                    "office": "newspaper"
                 },
                 "terms": [],
-                "name": "Tennis Court"
+                "name": "Newspaper"
             },
-            "leisure/pitch/volleyball": {
-                "icon": "pitch",
+            "office/ngo": {
+                "icon": "commercial",
                 "fields": [
-                    "surface"
+                    "address",
+                    "building_area",
+                    "opening_hours",
+                    "smoking"
                 ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "pitch",
-                    "sport": "volleyball"
+                    "office": "ngo"
                 },
                 "terms": [],
-                "name": "Volleyball Court"
+                "name": "NGO Office"
             },
-            "leisure/playground": {
-                "icon": "playground",
+            "office/physician": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "playground"
+                    "office": "physician"
                 },
-                "name": "Playground",
-                "terms": [
-                    "jungle gym",
-                    "play area"
-                ]
+                "terms": [],
+                "name": "Physician"
             },
-            "leisure/slipway": {
-                "geometry": [
-                    "point",
-                    "line"
+            "office/political_party": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "tags": {
-                    "leisure": "slipway"
-                },
-                "name": "Slipway"
-            },
-            "leisure/sports_center": {
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "sports_centre"
+                    "office": "political_party"
                 },
-                "terms": [
-                    "gym"
-                ],
-                "icon": "sports",
-                "name": "Sports Center"
+                "terms": [],
+                "name": "Political Party"
             },
-            "leisure/stadium": {
+            "office/research": {
+                "icon": "commercial",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "stadium"
+                    "office": "research"
                 },
-                "fields": [
-                    "sport"
-                ],
-                "name": "Stadium"
+                "terms": [],
+                "name": "Research Office"
             },
-            "leisure/swimming_pool": {
+            "office/telecommunication": {
+                "icon": "commercial",
                 "fields": [
-                    "access_simple"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
@@ -67675,2511 +72664,2621 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "leisure": "swimming_pool"
+                    "office": "telecommunication"
                 },
-                "icon": "swimming",
-                "name": "Swimming Pool"
+                "terms": [],
+                "name": "Telecom Office"
             },
-            "leisure/track": {
-                "icon": "pitch",
+            "office/therapist": {
+                "icon": "commercial",
                 "fields": [
-                    "surface"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "line",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "leisure": "track"
+                    "office": "therapist"
                 },
-                "name": "Race Track"
-            },
-            "line": {
-                "name": "Line",
-                "tags": {},
-                "geometry": [
-                    "line"
-                ],
-                "matchScore": 0.1
+                "terms": [],
+                "name": "Therapist"
             },
-            "man_made": {
+            "office/travel_agent": {
+                "icon": "suitcase",
                 "fields": [
-                    "man_made"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
-                    "line",
                     "area"
                 ],
                 "tags": {
-                    "man_made": "*"
+                    "office": "travel_agent"
                 },
-                "name": "Man Made"
+                "terms": [],
+                "name": "Travel Agency",
+                "searchable": false
             },
-            "man_made/breakwater": {
+            "piste": {
+                "icon": "skiing",
+                "fields": [
+                    "piste/type",
+                    "piste/difficulty",
+                    "piste/grooming",
+                    "oneway",
+                    "lit"
+                ],
                 "geometry": [
+                    "point",
                     "line",
                     "area"
                 ],
-                "tags": {
-                    "man_made": "breakwater"
-                },
-                "name": "Breakwater"
-            },
-            "man_made/cutline": {
-                "geometry": [
-                    "line"
+                "terms": [
+                    "ski",
+                    "sled",
+                    "sleigh",
+                    "snowboard",
+                    "nordic",
+                    "downhill",
+                    "snowmobile"
                 ],
                 "tags": {
-                    "man_made": "cutline"
+                    "piste:type": "*"
                 },
-                "name": "Cut line"
+                "name": "Piste/Ski Trail"
             },
-            "man_made/embankment": {
+            "place": {
+                "fields": [
+                    "place"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
-                    "man_made": "embankment"
+                    "place": "*"
                 },
-                "name": "Embankment",
-                "searchable": false
+                "name": "Place"
             },
-            "man_made/flagpole": {
+            "place/city": {
+                "icon": "city",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
-                    "point"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "man_made": "flagpole"
+                    "place": "city"
                 },
-                "name": "Flagpole",
-                "icon": "embassy"
+                "name": "City"
             },
-            "man_made/lighthouse": {
+            "place/hamlet": {
+                "icon": "triangle-stroked",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "man_made": "lighthouse"
+                    "place": "hamlet"
                 },
-                "name": "Lighthouse",
-                "icon": "lighthouse"
+                "name": "Hamlet"
             },
-            "man_made/observation": {
+            "place/island": {
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "terms": [
-                    "lookout tower",
-                    "fire tower"
+                    "archipelago",
+                    "atoll",
+                    "bar",
+                    "cay",
+                    "isle",
+                    "islet",
+                    "key",
+                    "reef"
                 ],
                 "tags": {
-                    "man_made": "tower",
-                    "tower:type": "observation"
+                    "place": "island"
                 },
-                "name": "Observation Tower"
+                "name": "Island"
             },
-            "man_made/pier": {
+            "place/isolated_dwelling": {
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
                 "tags": {
-                    "man_made": "pier"
+                    "place": "isolated_dwelling"
                 },
-                "name": "Pier"
+                "name": "Isolated Dwelling"
             },
-            "man_made/pipeline": {
-                "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "man_made": "pipeline"
-                },
+            "place/locality": {
+                "icon": "marker",
                 "fields": [
-                    "location",
-                    "operator"
+                    "population"
                 ],
-                "name": "Pipeline",
-                "icon": "pipeline"
-            },
-            "man_made/survey_point": {
-                "icon": "monument",
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
                 "tags": {
-                    "man_made": "survey_point"
+                    "place": "locality"
                 },
+                "name": "Locality"
+            },
+            "place/neighbourhood": {
+                "icon": "triangle-stroked",
                 "fields": [
-                    "ref"
+                    "population"
                 ],
-                "name": "Survey Point"
-            },
-            "man_made/tower": {
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "man_made": "tower"
+                    "place": "neighbourhood"
                 },
-                "fields": [
-                    "towertype"
+                "terms": [
+                    "neighbourhood"
                 ],
-                "name": "Tower"
+                "name": "Neighborhood"
             },
-            "man_made/wastewater_plant": {
-                "icon": "water",
+            "place/suburb": {
+                "icon": "triangle-stroked",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "man_made": "wastewater_plant"
+                    "place": "suburb"
                 },
-                "name": "Wastewater Plant",
                 "terms": [
-                    "sewage works",
-                    "sewage treatment plant",
-                    "water treatment plant",
-                    "reclamation plant"
-                ]
+                    "Boro",
+                    "Quarter"
+                ],
+                "name": "Borough"
             },
-            "man_made/water_tower": {
-                "icon": "water",
+            "place/town": {
+                "icon": "town",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "man_made": "water_tower"
+                    "place": "town"
                 },
-                "name": "Water Tower"
+                "name": "Town"
             },
-            "man_made/water_well": {
+            "place/village": {
+                "icon": "village",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "man_made": "water_well"
+                    "place": "village"
                 },
-                "name": "Water well"
+                "name": "Village"
             },
-            "man_made/water_works": {
-                "icon": "water",
+            "point": {
+                "name": "Point",
+                "tags": {},
+                "geometry": [
+                    "point"
+                ],
+                "matchScore": 0.1
+            },
+            "power": {
                 "geometry": [
                     "point",
+                    "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "man_made": "water_works"
+                    "power": "*"
                 },
-                "name": "Water Works"
+                "fields": [
+                    "power"
+                ],
+                "name": "Power"
             },
-            "military/airfield": {
+            "power/generator": {
+                "fields": [
+                    "operator",
+                    "generator/source",
+                    "generator/method",
+                    "generator/type"
+                ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
                 "tags": {
-                    "military": "airfield"
+                    "power": "generator"
                 },
-                "terms": [],
-                "name": "Airfield",
-                "icon": "airfield"
+                "name": "Power Generator"
             },
-            "military/barracks": {
+            "power/line": {
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "military": "barracks"
+                    "power": "line"
                 },
-                "terms": [],
-                "name": "Barracks"
+                "name": "Power Line",
+                "icon": "power-line"
             },
-            "military/bunker": {
+            "power/minor_line": {
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "military": "bunker"
+                    "power": "minor_line"
                 },
-                "terms": [],
-                "name": "Bunker"
+                "name": "Minor Power Line",
+                "icon": "power-line"
             },
-            "military/range": {
+            "power/pole": {
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
-                    "military": "range"
+                    "power": "pole"
                 },
-                "terms": [],
-                "name": "Military Range"
+                "name": "Power Pole"
             },
-            "natural": {
+            "power/sub_station": {
                 "fields": [
-                    "natural"
+                    "operator",
+                    "building"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "natural": "*"
+                    "power": "sub_station"
                 },
-                "name": "Natural"
+                "name": "Substation",
+                "searchable": false
             },
-            "natural/bay": {
+            "power/substation": {
+                "fields": [
+                    "operator",
+                    "building"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
-                    "natural": "bay"
+                    "power": "substation"
                 },
-                "name": "Bay"
+                "name": "Substation"
             },
-            "natural/beach": {
-                "fields": [
-                    "surface"
+            "power/tower": {
+                "geometry": [
+                    "vertex"
                 ],
+                "tags": {
+                    "power": "tower"
+                },
+                "name": "High-Voltage Tower"
+            },
+            "power/transformer": {
                 "geometry": [
                     "point",
+                    "vertex",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
-                    "natural": "beach"
+                    "power": "transformer"
                 },
-                "name": "Beach"
+                "name": "Transformer"
             },
-            "natural/cliff": {
+            "public_transport/platform": {
+                "fields": [
+                    "ref",
+                    "operator",
+                    "network",
+                    "shelter"
+                ],
                 "geometry": [
                     "point",
                     "vertex",
                     "line",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
-                    "natural": "cliff"
+                    "public_transport": "platform"
                 },
-                "name": "Cliff"
+                "name": "Platform"
             },
-            "natural/coastline": {
-                "geometry": [
-                    "line"
+            "public_transport/stop_position": {
+                "icon": "bus",
+                "fields": [
+                    "ref",
+                    "operator",
+                    "network"
                 ],
-                "terms": [
-                    "shore"
+                "geometry": [
+                    "vertex"
                 ],
                 "tags": {
-                    "natural": "coastline"
+                    "public_transport": "stop_position"
                 },
-                "name": "Coastline"
+                "name": "Stop Position"
             },
-            "natural/fell": {
+            "railway": {
+                "fields": [
+                    "railway"
+                ],
                 "geometry": [
+                    "point",
+                    "vertex",
+                    "line",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
-                    "natural": "fell"
+                    "railway": "*"
                 },
-                "name": "Fell"
+                "name": "Railway"
             },
-            "natural/glacier": {
+            "railway/abandoned": {
+                "icon": "railway-abandoned",
                 "geometry": [
-                    "area"
+                    "line"
                 ],
-                "terms": [],
                 "tags": {
-                    "natural": "glacier"
+                    "railway": "abandoned"
                 },
-                "name": "Glacier"
+                "fields": [
+                    "structure"
+                ],
+                "terms": [],
+                "name": "Abandoned Railway"
             },
-            "natural/grassland": {
+            "railway/disused": {
+                "icon": "railway-disused",
                 "geometry": [
-                    "point",
-                    "area"
+                    "line"
                 ],
-                "terms": [],
                 "tags": {
-                    "natural": "grassland"
+                    "railway": "disused"
                 },
-                "name": "Grassland"
+                "fields": [
+                    "structure"
+                ],
+                "terms": [],
+                "name": "Disused Railway"
             },
-            "natural/heath": {
+            "railway/funicular": {
                 "geometry": [
-                    "area"
+                    "line"
+                ],
+                "terms": [
+                    "venicular",
+                    "cliff railway",
+                    "cable car",
+                    "cable railway",
+                    "funicular railway"
+                ],
+                "fields": [
+                    "structure",
+                    "gauge"
                 ],
-                "terms": [],
                 "tags": {
-                    "natural": "heath"
+                    "railway": "funicular"
                 },
-                "name": "Heath"
+                "icon": "railway-rail",
+                "name": "Funicular"
             },
-            "natural/peak": {
-                "icon": "triangle",
-                "fields": [
-                    "elevation"
-                ],
+            "railway/halt": {
+                "icon": "rail",
                 "geometry": [
                     "point",
                     "vertex"
                 ],
                 "tags": {
-                    "natural": "peak"
+                    "railway": "halt"
                 },
+                "name": "Railway Halt",
                 "terms": [
-                    "acme",
-                    "aiguille",
-                    "alp",
-                    "climax",
-                    "crest",
-                    "crown",
-                    "hill",
-                    "mount",
-                    "mountain",
-                    "pinnacle",
-                    "summit",
-                    "tip",
-                    "top"
-                ],
-                "name": "Peak"
+                    "break",
+                    "interrupt",
+                    "rest",
+                    "wait",
+                    "interruption"
+                ]
             },
-            "natural/scree": {
+            "railway/level_crossing": {
+                "icon": "cross",
                 "geometry": [
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
-                    "natural": "scree"
+                    "railway": "level_crossing"
                 },
                 "terms": [
-                    "loose rocks"
+                    "crossing",
+                    "railroad crossing",
+                    "railway crossing",
+                    "grade crossing",
+                    "road through railroad",
+                    "train crossing"
                 ],
-                "name": "Scree"
+                "name": "Level Crossing"
             },
-            "natural/scrub": {
+            "railway/monorail": {
+                "icon": "railway-monorail",
                 "geometry": [
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "natural": "scrub"
+                    "railway": "monorail"
                 },
+                "fields": [
+                    "structure",
+                    "electrified"
+                ],
                 "terms": [],
-                "name": "Scrub"
+                "name": "Monorail"
             },
-            "natural/spring": {
+            "railway/narrow_gauge": {
+                "icon": "railway-rail",
                 "geometry": [
-                    "point",
-                    "vertex"
+                    "line"
                 ],
-                "terms": [],
                 "tags": {
-                    "natural": "spring"
+                    "railway": "narrow_gauge"
                 },
-                "name": "Spring"
-            },
-            "natural/tree": {
                 "fields": [
-                    "tree_type",
-                    "denotation"
+                    "structure",
+                    "gauge",
+                    "electrified"
                 ],
-                "icon": "park",
+                "terms": [
+                    "narrow gauge railway",
+                    "narrow gauge railroad"
+                ],
+                "name": "Narrow Gauge Rail"
+            },
+            "railway/platform": {
                 "geometry": [
                     "point",
-                    "vertex"
+                    "vertex",
+                    "line",
+                    "area"
                 ],
-                "terms": [],
                 "tags": {
-                    "natural": "tree"
+                    "railway": "platform"
                 },
-                "name": "Tree"
+                "name": "Railway Platform"
             },
-            "natural/water": {
-                "fields": [
-                    "water"
-                ],
+            "railway/rail": {
+                "icon": "railway-rail",
                 "geometry": [
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "natural": "water"
+                    "railway": "rail"
                 },
-                "icon": "water",
-                "name": "Water"
+                "fields": [
+                    "structure",
+                    "gauge",
+                    "electrified"
+                ],
+                "terms": [],
+                "name": "Rail"
             },
-            "natural/water/lake": {
+            "railway/station": {
+                "icon": "rail",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area"
+                ],
                 "geometry": [
+                    "point",
+                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "natural": "water",
-                    "water": "lake"
+                    "railway": "station"
                 },
                 "terms": [
-                    "lakelet",
-                    "loch",
-                    "mere"
+                    "train station",
+                    "station"
                 ],
-                "icon": "water",
-                "name": "Lake"
+                "name": "Railway Station"
             },
-            "natural/water/pond": {
+            "railway/subway": {
+                "icon": "railway-subway",
+                "fields": [
+                    "structure",
+                    "gauge",
+                    "electrified"
+                ],
                 "geometry": [
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "natural": "water",
-                    "water": "pond"
+                    "railway": "subway"
                 },
-                "terms": [
-                    "lakelet",
-                    "millpond",
-                    "tarn",
-                    "pool",
-                    "mere"
-                ],
-                "icon": "water",
-                "name": "Pond"
+                "terms": [],
+                "name": "Subway"
             },
-            "natural/water/reservoir": {
+            "railway/subway_entrance": {
+                "icon": "rail-metro",
                 "geometry": [
-                    "area"
+                    "point"
                 ],
                 "tags": {
-                    "natural": "water",
-                    "water": "reservoir"
+                    "railway": "subway_entrance"
                 },
-                "icon": "water",
-                "name": "Reservoir"
+                "terms": [],
+                "name": "Subway Entrance"
             },
-            "natural/wetland": {
-                "icon": "wetland",
+            "railway/tram": {
+                "icon": "railway-light-rail",
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "railway": "tram"
+                },
                 "fields": [
-                    "wetland"
+                    "structure",
+                    "gauge",
+                    "electrified"
                 ],
+                "terms": [
+                    "streetcar"
+                ],
+                "name": "Tram"
+            },
+            "relation": {
+                "name": "Relation",
+                "icon": "relation",
+                "tags": {},
                 "geometry": [
-                    "point",
-                    "area"
+                    "relation"
                 ],
-                "tags": {
-                    "natural": "wetland"
-                },
-                "terms": [],
-                "name": "Wetland"
-            },
-            "natural/wood": {
                 "fields": [
-                    "wood"
-                ],
-                "icon": "park2",
+                    "relation"
+                ]
+            },
+            "route/ferry": {
+                "icon": "ferry",
                 "geometry": [
-                    "point",
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "natural": "wood"
+                    "route": "ferry"
                 },
-                "terms": [],
-                "name": "Wood"
+                "name": "Ferry Route"
             },
-            "office": {
-                "icon": "commercial",
+            "shop": {
+                "icon": "shop",
                 "fields": [
-                    "office",
+                    "shop",
+                    "operator",
                     "address",
-                    "opening_hours",
-                    "smoking"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "*"
+                    "shop": "*"
                 },
                 "terms": [],
-                "name": "Office"
+                "name": "Shop"
             },
-            "office/accountant": {
-                "icon": "commercial",
+            "shop/alcohol": {
+                "icon": "alcohol-shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "alcohol",
+                    "beer",
+                    "booze",
+                    "wine"
+                ],
                 "tags": {
-                    "office": "accountant"
+                    "shop": "alcohol"
                 },
-                "terms": [],
-                "name": "Accountant"
+                "name": "Liquor Store"
             },
-            "office/administrative": {
-                "icon": "commercial",
+            "shop/anime": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "administrative"
+                    "shop": "anime"
                 },
-                "terms": [],
-                "name": "Administrative Office"
+                "name": "Anime Shop"
             },
-            "office/architect": {
-                "icon": "commercial",
+            "shop/antiques": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "architect"
+                    "shop": "antiques"
                 },
-                "terms": [],
-                "name": "Architect"
+                "name": "Antiques Shop"
             },
-            "office/company": {
-                "icon": "commercial",
+            "shop/art": {
+                "icon": "art-gallery",
                 "fields": [
+                    "operator",
                     "address",
-                    "opening_hours",
-                    "smoking"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "company"
+                    "shop": "art"
                 },
-                "terms": [],
-                "name": "Company Office"
+                "name": "Art Gallery"
             },
-            "office/educational_institution": {
-                "icon": "commercial",
+            "shop/baby_goods": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "educational_institution"
+                    "shop": "baby_goods"
                 },
-                "terms": [],
-                "name": "Educational Institution"
+                "name": "Baby Goods Store"
             },
-            "office/employment_agency": {
-                "icon": "commercial",
+            "shop/bag": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "handbag",
+                    "purse"
+                ],
                 "tags": {
-                    "office": "employment_agency"
+                    "shop": "bag"
                 },
-                "terms": [],
-                "name": "Employment Agency"
+                "name": "Bag/Luggage Store"
             },
-            "office/estate_agent": {
-                "icon": "commercial",
+            "shop/bakery": {
+                "icon": "bakery",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "estate_agent"
+                    "shop": "bakery"
                 },
-                "terms": [],
-                "name": "Real Estate Office"
+                "name": "Bakery"
             },
-            "office/financial": {
-                "icon": "commercial",
+            "shop/bathroom_furnishing": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "financial"
+                    "shop": "bathroom_furnishing"
                 },
-                "terms": [],
-                "name": "Financial Office"
+                "name": "Bathroom Furnishing Store"
             },
-            "office/government": {
-                "icon": "commercial",
+            "shop/beauty": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "nail spa",
+                    "spa",
+                    "salon",
+                    "tanning"
+                ],
                 "tags": {
-                    "office": "government"
+                    "shop": "beauty"
                 },
-                "terms": [],
-                "name": "Government Office"
+                "name": "Beauty Shop"
             },
-            "office/insurance": {
-                "icon": "commercial",
+            "shop/bed": {
+                "icon": "lodging",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "insurance"
+                    "shop": "bed"
                 },
-                "terms": [],
-                "name": "Insurance Office"
+                "name": "Bedding/Mattress Store"
             },
-            "office/it": {
-                "icon": "commercial",
+            "shop/beverages": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "it"
+                    "shop": "beverages"
                 },
-                "terms": [],
-                "name": "IT Office"
+                "name": "Beverage Store"
             },
-            "office/lawyer": {
-                "icon": "commercial",
+            "shop/bicycle": {
+                "icon": "bicycle",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "lawyer"
+                    "shop": "bicycle"
                 },
-                "terms": [],
-                "name": "Law Office"
+                "name": "Bicycle Shop"
             },
-            "office/newspaper": {
-                "icon": "commercial",
+            "shop/bookmaker": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "newspaper"
+                    "shop": "bookmaker"
                 },
-                "terms": [],
-                "name": "Newspaper"
+                "name": "Bookmaker"
             },
-            "office/ngo": {
-                "icon": "commercial",
+            "shop/books": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
-                    "opening_hours",
-                    "smoking"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "ngo"
+                    "shop": "books"
                 },
-                "terms": [],
-                "name": "NGO Office"
+                "name": "Book Store"
             },
-            "office/physician": {
-                "icon": "commercial",
+            "shop/boutique": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "physician"
+                    "shop": "boutique"
                 },
-                "terms": [],
-                "name": "Physician"
+                "name": "Boutique"
             },
-            "office/political_party": {
-                "icon": "commercial",
+            "shop/butcher": {
+                "icon": "slaughterhouse",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "meat"
+                ],
                 "tags": {
-                    "office": "political_party"
+                    "shop": "butcher"
                 },
-                "terms": [],
-                "name": "Political Party"
+                "name": "Butcher"
             },
-            "office/research": {
-                "icon": "commercial",
+            "shop/candles": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "office": "research"
+                    "shop": "candles"
                 },
-                "terms": [],
-                "name": "Research Office"
+                "name": "Candle Shop"
             },
-            "office/telecommunication": {
-                "icon": "commercial",
+            "shop/car": {
+                "icon": "car",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "auto"
+                ],
                 "tags": {
-                    "office": "telecommunication"
+                    "shop": "car"
                 },
-                "terms": [],
-                "name": "Telecom Office"
+                "name": "Car Dealership"
             },
-            "office/therapist": {
-                "icon": "commercial",
+            "shop/car_parts": {
+                "icon": "car",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "auto"
+                ],
                 "tags": {
-                    "office": "therapist"
+                    "shop": "car_parts"
                 },
-                "terms": [],
-                "name": "Therapist"
+                "name": "Car Parts Store"
             },
-            "office/travel_agent": {
-                "icon": "suitcase",
+            "shop/car_repair": {
+                "icon": "car",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "auto"
+                ],
                 "tags": {
-                    "office": "travel_agent"
+                    "shop": "car_repair"
                 },
-                "terms": [],
-                "name": "Travel Agency",
-                "searchable": false
+                "name": "Car Repair Shop"
             },
-            "piste": {
-                "icon": "skiing",
+            "shop/carpet": {
+                "icon": "shop",
                 "fields": [
-                    "piste/type",
-                    "piste/difficulty",
-                    "piste/grooming",
-                    "oneway",
-                    "lit"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "line",
                     "area"
                 ],
                 "terms": [
-                    "ski",
-                    "sled",
-                    "sleigh",
-                    "snowboard",
-                    "nordic",
-                    "downhill",
-                    "snowmobile"
+                    "rug"
                 ],
                 "tags": {
-                    "piste:type": "*"
+                    "shop": "carpet"
                 },
-                "name": "Piste/Ski Trail"
+                "name": "Carpet Store"
             },
-            "place": {
+            "shop/cheese": {
+                "icon": "shop",
                 "fields": [
-                    "place"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "place": "*"
+                    "shop": "cheese"
                 },
-                "name": "Place"
+                "name": "Cheese Store"
             },
-            "place/city": {
-                "icon": "city",
-                "geometry": [
-                    "point",
-                    "area"
+            "shop/chemist": {
+                "icon": "chemist",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "tags": {
-                    "place": "city"
-                },
-                "name": "City"
-            },
-            "place/hamlet": {
-                "icon": "triangle-stroked",
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "place": "hamlet"
+                    "shop": "chemist"
                 },
-                "name": "Hamlet"
+                "name": "Chemist"
             },
-            "place/island": {
-                "geometry": [
-                    "point",
-                    "area"
-                ],
-                "terms": [
-                    "archipelago",
-                    "atoll",
-                    "bar",
-                    "cay",
-                    "isle",
-                    "islet",
-                    "key",
-                    "reef"
+            "shop/chocolate": {
+                "icon": "shop",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "tags": {
-                    "place": "island"
-                },
-                "name": "Island"
-            },
-            "place/isolated_dwelling": {
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "place": "isolated_dwelling"
+                    "shop": "chocolate"
                 },
-                "name": "Isolated Dwelling"
+                "name": "Chocolate Store"
             },
-            "place/locality": {
-                "icon": "marker",
-                "geometry": [
-                    "point",
-                    "area"
+            "shop/clothes": {
+                "icon": "clothing-store",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "tags": {
-                    "place": "locality"
-                },
-                "name": "Locality"
-            },
-            "place/neighbourhood": {
-                "icon": "triangle-stroked",
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "place": "neighbourhood"
+                    "shop": "clothes"
                 },
-                "terms": [
-                    "neighbourhood"
-                ],
-                "name": "Neighborhood"
+                "name": "Clothing Store"
             },
-            "place/suburb": {
-                "icon": "triangle-stroked",
-                "geometry": [
-                    "point",
-                    "area"
-                ],
-                "tags": {
-                    "place": "suburb"
-                },
-                "terms": [
-                    "Boro",
-                    "Quarter"
+            "shop/computer": {
+                "icon": "shop",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "name": "Borough"
-            },
-            "place/town": {
-                "icon": "town",
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "place": "town"
+                    "shop": "computer"
                 },
-                "name": "Town"
+                "name": "Computer Store"
             },
-            "place/village": {
-                "icon": "village",
+            "shop/confectionery": {
+                "icon": "shop",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "place": "village"
+                    "shop": "confectionery"
                 },
-                "name": "Village"
+                "name": "Candy Store"
             },
-            "point": {
-                "name": "Point",
-                "tags": {},
-                "geometry": [
-                    "point"
+            "shop/convenience": {
+                "icon": "shop",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "matchScore": 0.1
-            },
-            "power": {
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line",
                     "area"
                 ],
                 "tags": {
-                    "power": "*"
+                    "shop": "convenience"
                 },
+                "name": "Convenience Store"
+            },
+            "shop/copyshop": {
+                "icon": "shop",
                 "fields": [
-                    "power"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "name": "Power"
-            },
-            "power/generator": {
-                "name": "Power Generator",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "power": "generator"
-                },
-                "fields": [
-                    "generator/source",
-                    "generator/method",
-                    "generator/type"
-                ]
-            },
-            "power/line": {
-                "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "power": "line"
+                    "shop": "copyshop"
                 },
-                "name": "Power Line",
-                "icon": "power-line"
+                "name": "Copy Store"
             },
-            "power/minor_line": {
-                "geometry": [
-                    "line"
+            "shop/cosmetics": {
+                "icon": "shop",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "tags": {
-                    "power": "minor_line"
-                },
-                "name": "Minor Power Line",
-                "icon": "power-line"
-            },
-            "power/pole": {
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "power": "pole"
+                    "shop": "cosmetics"
                 },
-                "name": "Power Pole"
+                "name": "Cosmetics Store"
             },
-            "power/sub_station": {
+            "shop/craft": {
+                "icon": "art-gallery",
                 "fields": [
                     "operator",
-                    "building"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "tags": {
-                    "power": "sub_station"
-                },
-                "name": "Substation"
-            },
-            "power/tower": {
-                "geometry": [
-                    "vertex"
-                ],
-                "tags": {
-                    "power": "tower"
+                    "shop": "craft"
                 },
-                "name": "High-Voltage Tower"
+                "name": "Arts and Crafts Store"
             },
-            "power/transformer": {
+            "shop/curtain": {
+                "icon": "shop",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "drape*",
+                    "window"
+                ],
                 "tags": {
-                    "power": "transformer"
+                    "shop": "curtain"
                 },
-                "name": "Transformer"
+                "name": "Curtain Store"
             },
-            "public_transport/platform": {
+            "shop/dairy": {
+                "icon": "shop",
                 "fields": [
-                    "ref",
                     "operator",
-                    "network",
-                    "shelter"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line",
                     "area"
                 ],
+                "terms": [
+                    "milk",
+                    "egg",
+                    "cheese"
+                ],
                 "tags": {
-                    "public_transport": "platform"
+                    "shop": "dairy"
                 },
-                "name": "Platform"
+                "name": "Dairy Store"
             },
-            "public_transport/stop_position": {
-                "icon": "bus",
+            "shop/deli": {
+                "icon": "restaurant",
                 "fields": [
-                    "ref",
                     "operator",
-                    "network"
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "lunch",
+                    "meat",
+                    "sandwich"
                 ],
                 "tags": {
-                    "public_transport": "stop_position"
+                    "shop": "deli"
                 },
-                "name": "Stop Position"
+                "name": "Deli"
             },
-            "railway": {
+            "shop/department_store": {
+                "icon": "shop",
                 "fields": [
-                    "railway"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line",
                     "area"
                 ],
                 "tags": {
-                    "railway": "*"
+                    "shop": "department_store"
                 },
-                "name": "Railway"
+                "name": "Department Store"
             },
-            "railway/abandoned": {
-                "icon": "railway-abandoned",
+            "shop/doityourself": {
+                "icon": "shop",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "railway": "abandoned"
+                    "shop": "doityourself"
                 },
+                "name": "DIY Store"
+            },
+            "shop/dry_cleaning": {
+                "icon": "shop",
                 "fields": [
-                    "structure"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "terms": [],
-                "name": "Abandoned Railway"
-            },
-            "railway/disused": {
-                "icon": "railway-disused",
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "railway": "disused"
+                    "shop": "dry_cleaning"
                 },
+                "name": "Dry Cleaner"
+            },
+            "shop/electronics": {
+                "icon": "shop",
                 "fields": [
-                    "structure"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "terms": [],
-                "name": "Disused Railway"
-            },
-            "railway/funicular": {
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "terms": [
-                    "venicular",
-                    "cliff railway",
-                    "cable car",
-                    "cable railway",
-                    "funicular railway"
-                ],
-                "fields": [
-                    "structure",
-                    "gauge"
+                    "appliance",
+                    "audio",
+                    "computer",
+                    "tv"
                 ],
                 "tags": {
-                    "railway": "funicular"
+                    "shop": "electronics"
                 },
-                "icon": "railway-rail",
-                "name": "Funicular"
+                "name": "Electronics Store"
             },
-            "railway/halt": {
-                "icon": "rail",
+            "shop/erotic": {
+                "icon": "shop",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
                 ],
-                "tags": {
-                    "railway": "halt"
-                },
-                "name": "Railway Halt",
                 "terms": [
-                    "break",
-                    "interrupt",
-                    "rest",
-                    "wait",
-                    "interruption"
-                ]
-            },
-            "railway/level_crossing": {
-                "icon": "cross",
-                "geometry": [
-                    "vertex"
+                    "sex",
+                    "porn"
                 ],
                 "tags": {
-                    "railway": "level_crossing"
+                    "shop": "erotic"
                 },
-                "terms": [
-                    "crossing",
-                    "railroad crossing",
-                    "railway crossing",
-                    "grade crossing",
-                    "road through railroad",
-                    "train crossing"
-                ],
-                "name": "Level Crossing"
+                "name": "Erotic Store"
             },
-            "railway/monorail": {
-                "icon": "railway-monorail",
-                "geometry": [
-                    "line"
-                ],
-                "tags": {
-                    "railway": "monorail"
-                },
+            "shop/fabric": {
+                "icon": "shop",
                 "fields": [
-                    "structure",
-                    "electrified"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "terms": [],
-                "name": "Monorail"
-            },
-            "railway/narrow_gauge": {
-                "icon": "railway-rail",
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "sew"
                 ],
                 "tags": {
-                    "railway": "narrow_gauge"
+                    "shop": "fabric"
                 },
+                "name": "Fabric Store"
+            },
+            "shop/farm": {
+                "icon": "shop",
                 "fields": [
-                    "structure",
-                    "gauge",
-                    "electrified"
-                ],
-                "terms": [
-                    "narrow gauge railway",
-                    "narrow gauge railroad"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
-                "name": "Narrow Gauge Rail"
-            },
-            "railway/platform": {
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line",
                     "area"
                 ],
-                "tags": {
-                    "railway": "platform"
-                },
-                "name": "Railway Platform"
-            },
-            "railway/rail": {
-                "icon": "railway-rail",
-                "geometry": [
-                    "line"
+                "terms": [
+                    "farm shop",
+                    "farm stand"
                 ],
                 "tags": {
-                    "railway": "rail"
+                    "shop": "farm"
                 },
-                "fields": [
-                    "structure",
-                    "gauge",
-                    "electrified"
-                ],
-                "terms": [],
-                "name": "Rail"
+                "name": "Produce Stand"
             },
-            "railway/station": {
-                "icon": "rail",
+            "shop/fashion": {
+                "icon": "shop",
                 "fields": [
-                    "building_area"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "railway": "station"
+                    "shop": "fashion"
                 },
-                "terms": [
-                    "train station",
-                    "station"
-                ],
-                "name": "Railway Station"
+                "name": "Fashion Store"
             },
-            "railway/subway": {
-                "icon": "railway-subway",
+            "shop/fishmonger": {
+                "icon": "shop",
                 "fields": [
-                    "structure",
-                    "gauge",
-                    "electrified"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "railway": "subway"
+                    "shop": "fishmonger"
                 },
-                "terms": [],
-                "name": "Subway"
+                "name": "Fishmonger",
+                "searchable": false
             },
-            "railway/subway_entrance": {
-                "icon": "rail-metro",
+            "shop/florist": {
+                "icon": "shop",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "point"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "flower"
                 ],
                 "tags": {
-                    "railway": "subway_entrance"
+                    "shop": "florist"
                 },
-                "terms": [],
-                "name": "Subway Entrance"
+                "name": "Florist"
             },
-            "railway/tram": {
-                "icon": "railway-light-rail",
+            "shop/frame": {
+                "icon": "shop",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
                 "tags": {
-                    "railway": "tram"
+                    "shop": "frame"
                 },
+                "name": "Framing Shop"
+            },
+            "shop/funeral_directors": {
+                "icon": "cemetery",
                 "fields": [
-                    "structure",
-                    "gauge",
-                    "electrified"
-                ],
-                "terms": [
-                    "streetcar"
+                    "operator",
+                    "address",
+                    "building_area",
+                    "religion",
+                    "denomination"
                 ],
-                "name": "Tram"
-            },
-            "relation": {
-                "name": "Relation",
-                "icon": "relation",
-                "tags": {},
                 "geometry": [
-                    "relation"
+                    "point",
+                    "area"
                 ],
-                "fields": [
-                    "relation"
-                ]
-            },
-            "route/ferry": {
-                "icon": "ferry",
-                "geometry": [
-                    "line"
+                "terms": [
+                    "undertaker",
+                    "memorial home"
                 ],
                 "tags": {
-                    "route": "ferry"
+                    "shop": "funeral_directors"
                 },
-                "name": "Ferry Route"
+                "name": "Funeral Home"
             },
-            "shop": {
+            "shop/furnace": {
                 "icon": "shop",
                 "fields": [
-                    "shop",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "oven",
+                    "stove"
+                ],
                 "tags": {
-                    "shop": "*"
+                    "shop": "furnace"
                 },
-                "terms": [],
-                "name": "Shop"
+                "name": "Furnace Store"
             },
-            "shop/alcohol": {
-                "icon": "alcohol-shop",
+            "shop/furniture": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "tags": {
-                    "shop": "alcohol"
-                },
                 "terms": [
-                    "alcohol"
+                    "chair",
+                    "sofa",
+                    "table"
                 ],
-                "name": "Liquor Store"
+                "tags": {
+                    "shop": "furniture"
+                },
+                "name": "Furniture Store"
             },
-            "shop/art": {
-                "icon": "art-gallery",
+            "shop/garden_centre": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "terms": [
-                    "art store",
-                    "art gallery"
+                    "landscape",
+                    "mulch",
+                    "shrub",
+                    "tree"
                 ],
                 "tags": {
-                    "shop": "art"
+                    "shop": "garden_centre"
                 },
-                "name": "Art Shop"
+                "name": "Garden Center"
             },
-            "shop/bakery": {
-                "icon": "bakery",
+            "shop/gift": {
+                "icon": "gift",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "bakery"
+                    "shop": "gift"
                 },
-                "name": "Bakery"
+                "name": "Gift Shop"
             },
-            "shop/beauty": {
+            "shop/greengrocer": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "terms": [
-                    "nail spa",
-                    "spa",
-                    "salon",
-                    "tanning"
+                    "fruit",
+                    "vegetable"
                 ],
                 "tags": {
-                    "shop": "beauty"
+                    "shop": "greengrocer"
                 },
-                "name": "Beauty Shop"
+                "name": "Greengrocer"
             },
-            "shop/beverages": {
-                "icon": "shop",
+            "shop/hairdresser": {
+                "icon": "hairdresser",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "beverages"
+                    "shop": "hairdresser"
                 },
-                "name": "Beverage Store"
+                "name": "Hairdresser"
             },
-            "shop/bicycle": {
-                "icon": "bicycle",
+            "shop/hardware": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "bicycle"
+                    "shop": "hardware"
                 },
-                "name": "Bicycle Shop"
+                "name": "Hardware Store"
             },
-            "shop/bookmaker": {
+            "shop/hearing_aids": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "bookmaker"
+                    "shop": "hearing_aids"
                 },
-                "name": "Bookmaker"
+                "name": "Hearing Aids Store"
             },
-            "shop/books": {
+            "shop/herbalist": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "books"
+                    "shop": "herbalist"
                 },
-                "name": "Bookstore"
+                "name": "Herbalist"
             },
-            "shop/boutique": {
+            "shop/hifi": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "stereo",
+                    "video"
+                ],
                 "tags": {
-                    "shop": "boutique"
+                    "shop": "hifi"
                 },
-                "name": "Boutique"
+                "name": "Hifi Store"
             },
-            "shop/butcher": {
-                "icon": "slaughterhouse",
+            "shop/interior_decoration": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
+                    "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
-                    "shop": "butcher"
+                    "shop": "interior_decoration"
                 },
-                "name": "Butcher"
+                "name": "Interior Decoration Store"
             },
-            "shop/car": {
-                "icon": "car",
+            "shop/jewelry": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "diamond",
+                    "gem",
+                    "ring"
+                ],
                 "tags": {
-                    "shop": "car"
+                    "shop": "jewelry"
                 },
-                "name": "Car Dealership"
+                "name": "Jeweler"
             },
-            "shop/car_parts": {
+            "shop/kiosk": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "car_parts"
+                    "shop": "kiosk"
                 },
-                "name": "Car Parts Store"
+                "name": "News Kiosk"
             },
-            "shop/car_repair": {
+            "shop/kitchen": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "car_repair"
+                    "shop": "kitchen"
                 },
-                "name": "Car Repair Shop"
+                "name": "Kitchen Design Store"
             },
-            "shop/chemist": {
+            "shop/laundry": {
+                "icon": "laundry",
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "laundry"
+                },
+                "name": "Laundry"
+            },
+            "shop/leather": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "chemist"
+                    "shop": "leather"
                 },
-                "name": "Chemist"
+                "name": "Leather Store"
             },
-            "shop/clothes": {
-                "icon": "clothing-store",
+            "shop/locksmith": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "key",
+                    "lockpick"
+                ],
                 "tags": {
-                    "shop": "clothes"
+                    "shop": "locksmith"
                 },
-                "name": "Clothing Store"
+                "name": "Locksmith"
             },
-            "shop/computer": {
+            "shop/lottery": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "computer"
+                    "shop": "lottery"
                 },
-                "name": "Computer Store"
+                "name": "Lottery Shop"
             },
-            "shop/confectionery": {
+            "shop/mall": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "confectionery"
+                    "shop": "mall"
                 },
-                "name": "Confectionery"
+                "name": "Mall"
             },
-            "shop/convenience": {
+            "shop/massage": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "convenience"
+                    "shop": "massage"
                 },
-                "name": "Convenience Store"
+                "name": "Massage Shop"
             },
-            "shop/deli": {
-                "icon": "restaurant",
+            "shop/medical_supply": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "deli"
+                    "shop": "medical_supply"
                 },
-                "name": "Deli"
+                "name": "Medical Supply Store"
             },
-            "shop/department_store": {
-                "icon": "shop",
+            "shop/mobile_phone": {
+                "icon": "mobilephone",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "department_store"
+                    "shop": "mobile_phone"
                 },
-                "name": "Department Store"
+                "name": "Mobile Phone Store"
             },
-            "shop/doityourself": {
-                "icon": "shop",
+            "shop/money_lender": {
+                "icon": "bank",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "doityourself"
+                    "shop": "money_lender"
                 },
-                "name": "DIY Store"
+                "name": "Money Lender"
             },
-            "shop/dry_cleaning": {
-                "icon": "shop",
+            "shop/motorcycle": {
+                "icon": "scooter",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "dry_cleaning"
+                    "shop": "motorcycle"
                 },
-                "name": "Dry Cleaners"
+                "name": "Motorcycle Dealership"
             },
-            "shop/electronics": {
-                "icon": "shop",
+            "shop/music": {
+                "icon": "music",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "CD",
+                    "vinyl"
+                ],
                 "tags": {
-                    "shop": "electronics"
+                    "shop": "music"
                 },
-                "name": "Electronics Store"
+                "name": "Music Store"
             },
-            "shop/farm": {
-                "icon": "shop",
+            "shop/musical_instrument": {
+                "icon": "music",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "farm"
+                    "shop": "musical_instrument"
                 },
-                "terms": [
-                    "farm shop",
-                    "farm stand"
-                ],
-                "name": "Produce Stand"
+                "name": "Musical Instrument Store"
             },
-            "shop/fishmonger": {
+            "shop/newsagent": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "fishmonger"
+                    "shop": "newsagent"
                 },
-                "name": "Fishmonger",
-                "searchable": false
+                "name": "Newspaper/Magazine Shop"
             },
-            "shop/florist": {
+            "shop/optician": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "eye",
+                    "glasses"
+                ],
                 "tags": {
-                    "shop": "florist"
+                    "shop": "optician"
                 },
-                "name": "Florist"
+                "name": "Optician"
             },
-            "shop/funeral_directors": {
-                "icon": "cemetery",
+            "shop/organic": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
-                    "religion",
-                    "denomination"
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "funeral_directors"
+                    "shop": "supermarket",
+                    "organic": "only"
                 },
-                "terms": [
-                    "undertaker",
-                    "funeral parlour",
-                    "funeral parlor",
-                    "memorial home"
-                ],
-                "name": "Funeral Home"
+                "name": "Organic Goods Store"
             },
-            "shop/furniture": {
+            "shop/outdoor": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "camping",
+                    "climbing",
+                    "hiking"
+                ],
                 "tags": {
-                    "shop": "furniture"
+                    "shop": "outdoor"
                 },
-                "name": "Furniture Store"
+                "name": "Outdoors Store"
             },
-            "shop/garden_centre": {
-                "icon": "shop",
+            "shop/paint": {
+                "icon": "water",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "garden centre"
-                ],
                 "tags": {
-                    "shop": "garden_centre"
+                    "shop": "paint"
                 },
-                "name": "Garden Center"
+                "name": "Paint Store"
             },
-            "shop/gift": {
+            "shop/pawnbroker": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "gift"
+                    "shop": "pawnbroker"
                 },
-                "name": "Gift Shop"
+                "name": "Pawn Shop"
             },
-            "shop/greengrocer": {
-                "icon": "shop",
+            "shop/pet": {
+                "icon": "dog-park",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "cat",
+                    "dog",
+                    "fish"
+                ],
                 "tags": {
-                    "shop": "greengrocer"
+                    "shop": "pet"
                 },
-                "name": "Greengrocer"
+                "name": "Pet Store"
             },
-            "shop/hairdresser": {
-                "icon": "shop",
+            "shop/photo": {
+                "icon": "camera",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "camera",
+                    "film"
+                ],
                 "tags": {
-                    "shop": "hairdresser"
+                    "shop": "photo"
                 },
-                "name": "Hairdresser"
+                "name": "Photography Store"
             },
-            "shop/hardware": {
+            "shop/pyrotechnics": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "hardware"
+                    "shop": "pyrotechnics"
                 },
-                "name": "Hardware Store"
+                "name": "Fireworks Store"
             },
-            "shop/hifi": {
+            "shop/radiotechnics": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "hifi"
+                    "shop": "radiotechnics"
                 },
-                "name": "Hifi Store"
+                "name": "Radio/Electronic Component Store"
             },
-            "shop/jewelry": {
+            "shop/religion": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
-                    "opening_hours"
+                    "opening_hours",
+                    "religion",
+                    "denomination"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "jewelry"
+                    "shop": "religion"
                 },
-                "name": "Jeweler"
+                "name": "Religious Store"
             },
-            "shop/kiosk": {
-                "icon": "shop",
+            "shop/scuba_diving": {
+                "icon": "swimming",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "kiosk"
+                    "shop": "scuba_diving"
                 },
-                "name": "Kiosk"
+                "name": "Scuba Diving Shop"
             },
-            "shop/laundry": {
-                "icon": "laundry",
+            "shop/seafood": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "fishmonger"
+                ],
                 "tags": {
-                    "shop": "laundry"
+                    "shop": "seafood"
                 },
-                "name": "Laundry"
+                "name": "Seafood Shop"
             },
-            "shop/locksmith": {
+            "shop/second_hand": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "terms": [
-                    "keys"
+                    "secondhand",
+                    "second hand",
+                    "resale",
+                    "thrift",
+                    "used"
                 ],
                 "tags": {
-                    "shop": "locksmith"
+                    "shop": "second_hand"
                 },
-                "name": "Locksmith"
+                "name": "Consignment/Thrift Store"
             },
-            "shop/lottery": {
+            "shop/shoes": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "lottery"
+                    "shop": "shoes"
                 },
-                "name": "Lottery Shop"
+                "name": "Shoe Store"
             },
-            "shop/mall": {
+            "shop/sports": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "mall"
+                    "shop": "sports"
                 },
-                "name": "Mall"
+                "name": "Sporting Goods Store"
             },
-            "shop/mobile_phone": {
+            "shop/stationery": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "card",
+                    "paper"
+                ],
                 "tags": {
-                    "shop": "mobile_phone"
+                    "shop": "stationery"
                 },
-                "name": "Mobile Phone Store"
+                "name": "Stationery Store"
             },
-            "shop/motorcycle": {
-                "icon": "shop",
+            "shop/supermarket": {
+                "icon": "grocery",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "grocery",
+                    "store",
+                    "shop"
+                ],
                 "tags": {
-                    "shop": "motorcycle"
+                    "shop": "supermarket"
                 },
-                "name": "Motorcycle Dealership"
+                "name": "Supermarket"
             },
-            "shop/music": {
-                "icon": "music",
+            "shop/tailor": {
+                "icon": "clothing-store",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "clothes",
+                    "suit"
+                ],
                 "tags": {
-                    "shop": "music"
+                    "shop": "tailor"
                 },
-                "name": "Music Store"
+                "name": "Tailor"
             },
-            "shop/newsagent": {
+            "shop/tattoo": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "newsagent"
+                    "shop": "tattoo"
                 },
-                "name": "Newsagent"
+                "name": "Tattoo Parlor"
             },
-            "shop/optician": {
-                "icon": "shop",
+            "shop/tea": {
+                "icon": "cafe",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "optician"
+                    "shop": "tea"
                 },
-                "name": "Optician"
+                "name": "Tea Store"
             },
-            "shop/outdoor": {
+            "shop/ticket": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "outdoor"
+                    "shop": "ticket"
                 },
-                "name": "Outdoor Store"
+                "name": "Ticket Seller"
             },
-            "shop/pet": {
-                "icon": "dog-park",
+            "shop/tobacco": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "pet"
+                    "shop": "tobacco"
                 },
-                "name": "Pet Store"
+                "name": "Tobacco Shop"
             },
-            "shop/photo": {
-                "icon": "camera",
+            "shop/toys": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "photo"
+                    "shop": "toys"
                 },
-                "name": "Photography Store"
+                "name": "Toy Store"
             },
-            "shop/seafood": {
-                "icon": "shop",
+            "shop/travel_agency": {
+                "icon": "suitcase",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "seafood"
+                    "shop": "travel_agency"
                 },
-                "terms": [
-                    "fishmonger"
-                ],
-                "name": "Seafood Shop"
+                "name": "Travel Agency"
             },
-            "shop/shoes": {
+            "shop/tyres": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "shoes"
+                    "shop": "tyres"
                 },
-                "name": "Shoe Store"
+                "name": "Tire Store"
             },
-            "shop/sports": {
+            "shop/vacant": {
                 "icon": "shop",
                 "fields": [
                     "address",
-                    "building_area",
-                    "opening_hours"
+                    "building_area"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "sports"
+                    "shop": "vacant"
                 },
-                "name": "Sporting Goods Store"
+                "name": "Vacant Shop",
+                "searchable": false
             },
-            "shop/stationery": {
+            "shop/vacuum_cleaner": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "stationery"
+                    "shop": "vacuum_cleaner"
                 },
-                "name": "Stationery Store"
+                "name": "Vacuum Cleaner Store"
             },
-            "shop/supermarket": {
-                "icon": "grocery",
+            "shop/variety_store": {
+                "icon": "shop",
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [
-                    "bazaar",
-                    "boutique",
-                    "chain",
-                    "co-op",
-                    "cut-rate store",
-                    "discount store",
-                    "five-and-dime",
-                    "flea market",
-                    "galleria",
-                    "grocery store",
-                    "mall",
-                    "mart",
-                    "outlet",
-                    "outlet store",
-                    "shop",
-                    "shopping center",
-                    "shopping centre",
-                    "shopping plaza",
-                    "stand",
-                    "store",
-                    "supermarket",
-                    "thrift shop"
-                ],
                 "tags": {
-                    "shop": "supermarket"
+                    "shop": "variety_store"
                 },
-                "name": "Supermarket"
+                "name": "Variety Store"
             },
-            "shop/toys": {
+            "shop/video": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "DVD"
+                ],
                 "tags": {
-                    "shop": "toys"
+                    "shop": "video"
                 },
-                "name": "Toy Store"
+                "name": "Video Store"
             },
-            "shop/travel_agency": {
-                "icon": "suitcase",
+            "shop/video_games": {
+                "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "travel_agency"
+                    "shop": "video_games"
                 },
-                "name": "Travel Agency"
+                "name": "Video Game Store"
             },
-            "shop/tyres": {
+            "shop/water_sports": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "tyres"
+                    "shop": "water_sports"
                 },
-                "name": "Tire Store"
+                "name": "Watersport/Swim Shop"
             },
-            "shop/vacant": {
+            "shop/weapons": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
+                "terms": [
+                    "ammo",
+                    "gun",
+                    "knife",
+                    "knives"
+                ],
                 "tags": {
-                    "shop": "vacant"
+                    "shop": "weapons"
                 },
-                "name": "Vacant Shop"
+                "name": "Weapon Shop"
             },
-            "shop/variety_store": {
+            "shop/window_blind": {
                 "icon": "shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "variety_store"
+                    "shop": "window_blind"
                 },
-                "name": "Variety Store"
+                "name": "Window Blind Store"
             },
-            "shop/video": {
-                "icon": "shop",
+            "shop/wine": {
+                "icon": "alcohol-shop",
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
-                    "shop": "video"
+                    "shop": "wine"
                 },
-                "name": "Video Store"
+                "name": "Wine Shop"
             },
             "tourism": {
                 "fields": [
@@ -70199,11 +75298,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "lodging",
                 "fields": [
                     "operator",
-                    "address"
+                    "address",
+                    "building_area"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
@@ -70212,11 +75311,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Alpine Hut"
             },
             "tourism/artwork": {
+                "icon": "art-gallery",
                 "fields": [
                     "artwork_type",
                     "artist"
                 ],
-                "icon": "art-gallery",
                 "geometry": [
                     "point",
                     "vertex",
@@ -70252,17 +75351,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "campsite",
                 "fields": [
                     "operator",
-                    "address",
-                    "smoking"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [
-                    "camping"
-                ],
                 "tags": {
                     "tourism": "camp_site"
                 },
@@ -70288,13 +75383,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "lodging",
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "smoking"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
@@ -70307,11 +75401,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "operator",
                     "address",
+                    "building_area",
                     "smoking"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
@@ -70319,7 +75413,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "terms": [
                     "B&B",
-                    "Bed & Breakfast",
                     "Bed and Breakfast"
                 ],
                 "name": "Guest House"
@@ -70328,13 +75421,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "lodging",
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "smoking"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
@@ -70346,16 +75438,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "lodging",
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "smoking"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
                     "tourism": "hotel"
                 },
@@ -70364,9 +75454,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "tourism/information": {
                 "fields": [
                     "information",
-                    "building_area",
+                    "operator",
                     "address",
-                    "operator"
+                    "building_area"
                 ],
                 "geometry": [
                     "point",
@@ -70382,13 +75472,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "lodging",
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "smoking"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
@@ -70400,28 +75489,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "museum",
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "terms": [
                     "exhibition",
-                    "exhibits archive",
                     "foundation",
                     "gallery",
                     "hall",
-                    "institution",
-                    "library",
-                    "menagerie",
-                    "repository",
-                    "salon",
-                    "storehouse",
-                    "treasury",
-                    "vault"
+                    "institution"
                 ],
                 "tags": {
                     "tourism": "museum"
@@ -70440,7 +75521,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
-                "terms": [],
+                "terms": [
+                    "camp"
+                ],
                 "tags": {
                     "tourism": "picnic_site"
                 },
@@ -70449,11 +75532,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "tourism/theme_park": {
                 "fields": [
                     "operator",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
@@ -70475,11 +75558,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "zoo",
                 "fields": [
                     "operator",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "tags": {
@@ -70487,6 +75570,67 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Zoo"
             },
+            "traffic_calming/bump": {
+                "fields": [
+                    "surface"
+                ],
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "traffic_calming": "bump"
+                },
+                "terms": [
+                    "speed hump"
+                ],
+                "name": "Speed Bump"
+            },
+            "traffic_calming/hump": {
+                "fields": [
+                    "surface"
+                ],
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "traffic_calming": "hump"
+                },
+                "terms": [
+                    "speed bump"
+                ],
+                "name": "Speed Hump"
+            },
+            "traffic_calming/rumble_strip": {
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "traffic_calming": "rumble_strip"
+                },
+                "terms": [
+                    "sleeper lines",
+                    "audible lines",
+                    "growlers"
+                ],
+                "name": "Rumble Strip"
+            },
+            "traffic_calming/table": {
+                "fields": [
+                    "surface"
+                ],
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "highway": "crossing",
+                    "traffic_calming": "table"
+                },
+                "terms": [
+                    "speed table",
+                    "flat top hump"
+                ],
+                "name": "Raised Pedestrian Crossing"
+            },
             "type/boundary": {
                 "geometry": [
                     "relation"
@@ -70538,9 +75682,108 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "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"
@@ -70689,7 +75932,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Road Route",
                 "icon": "route-road",
                 "fields": [
-                    "ref"
+                    "ref",
+                    "network"
                 ]
             },
             "type/route/train": {
@@ -70763,6 +76007,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "waterway/canal": {
                 "icon": "waterway-canal",
+                "fields": [
+                    "width"
+                ],
                 "geometry": [
                     "line"
                 ],
@@ -70813,7 +76060,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "waterway/river": {
                 "icon": "waterway-river",
                 "fields": [
-                    "tunnel"
+                    "tunnel",
+                    "width"
                 ],
                 "geometry": [
                     "line"
@@ -70851,7 +76099,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "waterway/stream": {
                 "icon": "waterway-stream",
                 "fields": [
-                    "tunnel"
+                    "tunnel",
+                    "width"
                 ],
                 "geometry": [
                     "line"
@@ -70908,13 +76157,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -70927,13 +76176,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -70946,13 +76195,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -70965,13 +76214,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -70984,13 +76233,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71003,13 +76252,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71022,13 +76271,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71041,13 +76290,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71060,13 +76309,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71079,13 +76328,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71098,13 +76347,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71117,13 +76366,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71136,32 +76385,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
-                ],
-                "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"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71174,13 +76404,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71193,32 +76423,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
-            "amenity/fuel/Tesco": {
-                "tags": {
-                    "name": "Tesco",
-                    "amenity": "fuel"
-                },
-                "name": "Tesco",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71231,32 +76442,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
-            "amenity/fuel/Morrisons": {
-                "tags": {
-                    "name": "Morrisons",
-                    "amenity": "fuel"
-                },
-                "name": "Morrisons",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71269,32 +76461,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
-                ],
-                "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"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71307,13 +76480,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71326,13 +76499,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71345,13 +76518,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71364,32 +76537,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
-            "amenity/fuel/ABC": {
-                "tags": {
-                    "name": "ABC",
-                    "amenity": "fuel"
-                },
-                "name": "ABC",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71402,13 +76556,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71421,13 +76575,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71440,13 +76594,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71459,32 +76613,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
-            "amenity/fuel/Intermarché": {
-                "tags": {
-                    "name": "Intermarché",
-                    "amenity": "fuel"
-                },
-                "name": "Intermarché",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71497,51 +76632,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
-                ],
-                "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"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71554,32 +76651,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
-            "amenity/fuel/Carrefour": {
-                "tags": {
-                    "name": "Carrefour",
-                    "amenity": "fuel"
-                },
-                "name": "Carrefour",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71592,13 +76670,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71611,13 +76689,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71630,13 +76708,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71649,13 +76727,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71668,13 +76746,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71687,13 +76765,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71706,13 +76784,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71725,13 +76803,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71744,13 +76822,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71763,13 +76841,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71782,13 +76860,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71801,13 +76879,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71820,13 +76898,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71839,13 +76917,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71858,13 +76936,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71877,13 +76955,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71896,13 +76974,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71915,32 +76993,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
-            "amenity/fuel/Raiffeisenbank": {
-                "tags": {
-                    "name": "Raiffeisenbank",
-                    "amenity": "fuel"
-                },
-                "name": "Raiffeisenbank",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71953,13 +77012,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71972,13 +77031,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -71991,13 +77050,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72010,13 +77069,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72029,32 +77088,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
-            "amenity/fuel/Coop": {
-                "tags": {
-                    "name": "Coop",
-                    "amenity": "fuel"
-                },
-                "name": "Coop",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72067,13 +77107,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72086,13 +77126,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72105,13 +77145,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72124,13 +77164,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72143,13 +77183,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72162,13 +77202,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72181,13 +77221,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72200,13 +77240,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72219,13 +77259,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72238,13 +77278,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72257,32 +77297,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "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"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72295,13 +77316,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72314,13 +77335,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72333,13 +77354,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72352,13 +77373,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72371,13 +77392,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72390,13 +77411,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72409,13 +77430,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72428,13 +77449,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72447,13 +77468,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72466,13 +77487,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72485,13 +77506,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72504,13 +77525,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72523,13 +77544,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72542,13 +77563,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72561,13 +77582,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72580,13 +77601,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72599,13 +77620,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72618,13 +77639,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72637,13 +77658,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72656,13 +77677,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72675,13 +77696,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72694,13 +77715,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72713,13 +77734,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72732,13 +77753,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72751,13 +77772,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72770,13 +77791,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72789,13 +77810,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72808,13 +77829,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72827,13 +77848,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72846,13 +77867,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72865,13 +77886,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72884,13 +77905,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72903,13 +77924,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72922,13 +77943,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72941,13 +77962,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72960,13 +77981,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72979,13 +78000,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -72998,13 +78019,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73017,13 +78038,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73036,13 +78057,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73055,13 +78076,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73074,13 +78095,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73093,13 +78114,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73112,13 +78133,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73131,13 +78152,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73150,13 +78171,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73169,13 +78190,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73188,13 +78209,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73207,13 +78228,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73226,13 +78247,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73245,13 +78266,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73264,13 +78285,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73283,13 +78304,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73302,13 +78323,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73321,13 +78342,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73340,13 +78361,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73359,13 +78380,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73378,13 +78399,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73397,32 +78418,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
-            "amenity/fuel/Wawa": {
-                "tags": {
-                    "name": "Wawa",
-                    "amenity": "fuel"
-                },
-                "name": "Wawa",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73435,13 +78437,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73454,13 +78456,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73473,13 +78475,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73492,13 +78494,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73511,13 +78513,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73530,13 +78532,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73549,13 +78551,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73568,13 +78570,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73587,13 +78589,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73606,13 +78608,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73625,13 +78627,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73644,13 +78646,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73663,13 +78665,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73682,13 +78684,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73701,13 +78703,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73720,13 +78722,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73739,13 +78741,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73758,13 +78760,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73777,13 +78779,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73796,13 +78798,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73816,13 +78818,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73835,13 +78837,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73854,13 +78856,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73873,13 +78875,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73892,13 +78894,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73911,32 +78913,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "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"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73949,13 +78932,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73968,13 +78951,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -73987,13 +78970,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74006,13 +78989,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74025,13 +79008,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74044,13 +79027,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74063,13 +79046,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74082,32 +79065,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "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"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74120,13 +79084,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74139,13 +79103,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74158,13 +79122,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74177,13 +79141,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74196,13 +79160,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74215,13 +79179,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74234,13 +79198,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74253,51 +79217,32 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
-            "amenity/fuel/Posto": {
-                "tags": {
-                    "name": "Posto",
-                    "amenity": "fuel"
-                },
-                "name": "Posto",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/H-E-B": {
+            "amenity/fuel/Posto": {
                 "tags": {
-                    "name": "H-E-B",
+                    "name": "Posto",
                     "amenity": "fuel"
                 },
-                "name": "H-E-B",
+                "name": "Posto",
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74310,13 +79255,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74329,13 +79274,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74348,13 +79293,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74367,13 +79312,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74386,13 +79331,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74405,13 +79350,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74424,13 +79369,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fuel",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
                     "address",
-                    "building_area"
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -74443,12 +79388,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74463,12 +79407,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74483,12 +79426,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74503,12 +79445,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74523,12 +79464,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74543,12 +79483,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74563,12 +79502,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74583,12 +79521,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74603,12 +79540,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74623,12 +79559,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74643,12 +79578,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74663,12 +79597,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74683,12 +79616,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74703,12 +79635,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74723,12 +79654,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74743,12 +79673,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74763,12 +79692,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74783,12 +79711,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74803,12 +79730,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74823,12 +79749,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74843,12 +79768,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74863,12 +79787,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74883,12 +79806,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74903,12 +79825,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74923,12 +79844,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74943,12 +79863,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74963,12 +79882,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -74983,12 +79901,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75003,12 +79920,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75023,12 +79939,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75043,12 +79958,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75063,12 +79977,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75083,12 +79996,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75103,12 +80015,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75123,12 +80034,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75143,12 +80053,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75163,12 +80072,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75183,12 +80091,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75203,12 +80110,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75223,12 +80129,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75243,12 +80148,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75263,12 +80167,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75283,12 +80186,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75303,12 +80205,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75323,12 +80224,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75343,13 +80243,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75365,13 +80265,35 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
+                    "operator",
+                    "address",
                     "building_area",
+                    "opening_hours",
+                    "smoking"
+                ],
+                "suggestion": true
+            },
+            "amenity/fast_food/Subway": {
+                "tags": {
+                    "name": "Subway",
+                    "cuisine": "sandwich",
+                    "amenity": "fast_food"
+                },
+                "name": "Subway",
+                "icon": "fast-food",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "cuisine",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75387,13 +80309,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75408,13 +80330,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75430,13 +80352,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75451,13 +80373,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75473,13 +80395,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75495,13 +80417,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75516,13 +80438,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75537,13 +80459,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75558,13 +80480,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75579,13 +80501,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75601,13 +80523,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75622,13 +80544,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75643,13 +80565,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75665,13 +80587,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75686,13 +80608,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75707,13 +80629,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75728,13 +80650,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75749,13 +80671,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75770,13 +80692,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75791,13 +80713,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75812,13 +80734,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75833,13 +80755,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75854,13 +80776,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75876,13 +80798,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75897,13 +80819,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75918,13 +80840,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75939,13 +80861,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75960,13 +80882,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -75981,13 +80903,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76003,13 +80925,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76025,13 +80947,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76046,13 +80968,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76068,13 +80990,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76089,13 +81011,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76110,13 +81032,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76132,13 +81054,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76153,13 +81075,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76174,13 +81096,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76195,13 +81117,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76217,13 +81139,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76238,13 +81160,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76259,13 +81181,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76281,13 +81203,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76304,13 +81226,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76325,13 +81247,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76346,13 +81268,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76367,13 +81289,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76388,13 +81310,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76409,13 +81331,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76432,13 +81354,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76453,13 +81375,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76474,13 +81396,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76496,13 +81418,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76517,13 +81439,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76538,13 +81460,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76559,13 +81481,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76580,13 +81502,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76601,13 +81523,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76623,13 +81545,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76644,13 +81566,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76665,13 +81587,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76686,13 +81608,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76707,13 +81629,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76728,13 +81650,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76749,13 +81671,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76770,13 +81692,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76792,13 +81714,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76813,13 +81735,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76834,13 +81756,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76855,13 +81777,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76877,13 +81799,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76899,13 +81821,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76920,13 +81842,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76941,13 +81863,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "fast-food",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -76962,13 +81884,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -76984,13 +81905,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77006,13 +81926,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77028,13 +81947,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77050,13 +81968,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77072,13 +81989,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77094,13 +82010,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77116,13 +82031,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77138,13 +82052,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77160,13 +82073,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77182,13 +82094,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77204,13 +82115,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77226,13 +82136,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77248,13 +82157,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77270,13 +82178,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77292,13 +82199,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77314,13 +82220,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77336,13 +82241,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77358,13 +82262,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77380,13 +82283,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77402,13 +82304,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77424,13 +82325,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77446,13 +82346,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77468,13 +82367,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77490,13 +82388,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77512,13 +82409,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77534,13 +82430,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77556,13 +82451,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77578,13 +82472,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77600,13 +82493,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77622,13 +82514,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77644,13 +82535,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77666,13 +82556,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77688,13 +82577,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77710,13 +82598,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77732,13 +82619,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77754,13 +82640,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77776,13 +82661,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77798,13 +82682,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77820,13 +82703,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77842,13 +82724,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77864,13 +82745,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77886,13 +82766,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77908,13 +82787,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77930,13 +82808,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77952,13 +82829,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77974,13 +82850,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -77996,13 +82871,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78018,13 +82892,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78040,13 +82913,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78062,13 +82934,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78084,13 +82955,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78106,13 +82976,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78128,13 +82997,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78150,13 +83018,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78172,13 +83039,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78194,13 +83060,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78216,13 +83081,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78238,13 +83102,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78260,13 +83123,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78282,13 +83144,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78304,13 +83165,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78326,13 +83186,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78348,13 +83207,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78370,13 +83228,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78392,13 +83249,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78414,13 +83270,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78436,13 +83291,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78458,13 +83312,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78480,13 +83333,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78502,13 +83354,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78524,13 +83375,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78546,13 +83396,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78568,13 +83417,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78590,13 +83438,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78612,13 +83459,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78634,13 +83480,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78656,13 +83501,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78678,13 +83522,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78700,13 +83543,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78722,13 +83564,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78744,13 +83585,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78766,13 +83606,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78788,13 +83627,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78810,13 +83648,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78832,13 +83669,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78854,13 +83690,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78876,13 +83711,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78898,13 +83732,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78920,13 +83753,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78942,13 +83774,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78964,13 +83795,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -78986,13 +83816,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79008,13 +83837,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79030,13 +83858,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79052,13 +83879,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79074,13 +83900,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79096,13 +83921,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79118,13 +83942,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79140,13 +83963,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79162,13 +83984,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79184,13 +84005,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79206,13 +84026,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79229,13 +84048,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79251,13 +84069,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79273,13 +84090,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79295,13 +84111,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79317,13 +84132,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79339,13 +84153,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79361,13 +84174,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79383,13 +84195,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79405,13 +84216,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79427,13 +84237,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79449,13 +84258,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79471,13 +84279,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79493,13 +84300,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79515,13 +84321,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79537,13 +84342,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79559,13 +84363,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79581,13 +84384,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79603,13 +84405,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79625,13 +84426,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79647,13 +84447,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79669,13 +84468,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79691,13 +84489,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "restaurant",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "capacity",
                     "smoking"
@@ -79713,13 +84510,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79733,13 +84530,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79753,13 +84550,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79773,13 +84570,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79793,13 +84590,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79813,13 +84610,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79833,13 +84630,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79853,13 +84650,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79873,13 +84670,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79893,13 +84690,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79913,13 +84710,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79933,13 +84730,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79953,13 +84750,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79973,13 +84770,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -79993,13 +84790,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80013,13 +84810,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80033,13 +84830,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80053,13 +84850,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80073,13 +84870,33 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
+                    "operator",
+                    "address",
                     "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "amenity/bank/Raiffeisenbank": {
+                "tags": {
+                    "name": "Raiffeisenbank",
+                    "amenity": "bank"
+                },
+                "name": "Raiffeisenbank",
+                "icon": "bank",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "atm",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80093,13 +84910,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80113,13 +84930,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80133,13 +84950,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80153,13 +84970,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80173,13 +84990,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80193,13 +85010,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80213,13 +85030,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80233,13 +85050,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80253,13 +85070,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80273,13 +85090,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80293,13 +85110,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80313,13 +85130,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80333,13 +85150,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80353,13 +85170,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80373,13 +85190,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80393,13 +85210,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80413,13 +85230,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80433,13 +85250,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80453,13 +85270,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80473,13 +85290,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80493,13 +85310,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80513,13 +85330,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80533,13 +85350,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80553,13 +85370,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80573,13 +85390,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80593,13 +85410,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80613,13 +85430,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80633,13 +85450,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80653,13 +85470,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80673,13 +85490,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80693,13 +85510,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80713,13 +85530,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80733,13 +85550,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80753,13 +85570,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80773,13 +85590,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80793,13 +85610,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80813,13 +85630,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80833,13 +85650,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80853,13 +85670,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80873,13 +85690,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80893,13 +85710,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80913,13 +85730,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80933,13 +85750,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80953,13 +85770,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80973,13 +85790,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -80993,13 +85810,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81013,13 +85830,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81033,13 +85850,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81053,13 +85870,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81073,13 +85890,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81093,13 +85910,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81113,13 +85930,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81133,13 +85950,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81153,13 +85970,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81173,13 +85990,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81193,13 +86010,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81213,13 +86030,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81233,13 +86050,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81253,13 +86070,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81273,13 +86090,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81293,13 +86110,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81313,13 +86130,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81333,13 +86150,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81353,13 +86170,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81373,13 +86190,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81393,13 +86210,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81413,13 +86230,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81433,13 +86250,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81453,13 +86270,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81473,13 +86290,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81493,13 +86310,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81513,13 +86330,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81533,13 +86350,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81553,13 +86370,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81573,13 +86390,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81593,13 +86410,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81613,13 +86430,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81633,13 +86450,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81653,13 +86470,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81673,13 +86490,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81693,13 +86510,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81713,13 +86530,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81733,13 +86550,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81753,13 +86570,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81773,13 +86590,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81793,13 +86610,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81813,13 +86630,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81833,13 +86650,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81853,13 +86670,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81873,13 +86690,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81893,13 +86710,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81913,13 +86730,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81933,13 +86750,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81953,13 +86770,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81973,13 +86790,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -81993,13 +86810,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82013,13 +86830,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82033,13 +86850,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82053,13 +86870,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82073,13 +86890,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82093,13 +86910,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82113,13 +86930,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82133,13 +86950,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82153,13 +86970,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82173,13 +86990,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82193,13 +87010,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82213,13 +87030,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82233,13 +87050,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82253,13 +87070,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82273,13 +87090,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82293,13 +87110,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82313,13 +87130,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82333,13 +87150,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82353,13 +87170,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82373,13 +87190,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82393,13 +87210,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82413,13 +87230,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82433,13 +87250,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82453,13 +87270,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82473,13 +87290,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82493,13 +87310,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82513,13 +87330,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82533,13 +87350,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82553,13 +87370,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82573,13 +87390,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82593,13 +87410,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82613,13 +87430,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82633,13 +87450,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82653,13 +87470,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82673,13 +87490,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82693,13 +87510,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82713,13 +87530,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82733,13 +87550,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82753,13 +87570,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82773,13 +87590,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82793,13 +87610,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82813,13 +87630,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82833,13 +87650,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82853,13 +87670,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82873,13 +87690,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82893,13 +87710,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82913,13 +87730,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82933,13 +87750,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82953,13 +87770,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82973,13 +87790,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -82993,13 +87810,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83013,13 +87830,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83033,13 +87850,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83053,13 +87870,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83073,13 +87890,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83093,13 +87910,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83113,13 +87930,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83133,13 +87950,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83153,13 +87970,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83173,13 +87990,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83193,13 +88010,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83213,13 +88030,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83233,13 +88050,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83253,13 +88070,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83273,13 +88090,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83293,13 +88110,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83313,13 +88130,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83333,13 +88150,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83353,13 +88170,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83373,13 +88190,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83393,13 +88210,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83413,13 +88230,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83433,13 +88250,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83453,13 +88270,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83473,13 +88290,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83493,13 +88310,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83513,13 +88330,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83533,13 +88350,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83553,13 +88370,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83573,13 +88390,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83593,13 +88410,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83613,13 +88430,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83633,13 +88450,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83653,13 +88470,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83673,13 +88490,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83693,13 +88510,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83713,13 +88530,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83733,13 +88550,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83753,13 +88570,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83773,13 +88590,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83793,13 +88610,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83813,13 +88630,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83833,13 +88650,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83853,13 +88670,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83873,13 +88690,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83893,13 +88710,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83913,13 +88730,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83934,13 +88751,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83955,13 +88772,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83976,13 +88793,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -83997,13 +88814,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84018,13 +88835,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84038,13 +88855,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84058,13 +88875,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84078,13 +88895,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84098,13 +88915,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84118,13 +88935,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84138,13 +88955,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84158,13 +88975,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84179,13 +88996,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84199,13 +89016,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84219,13 +89036,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84239,13 +89056,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84259,13 +89076,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84279,13 +89096,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84299,13 +89116,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84319,13 +89136,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84339,13 +89156,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84359,13 +89176,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84379,13 +89196,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84399,13 +89216,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84419,13 +89236,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84439,13 +89256,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84459,13 +89276,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84479,13 +89296,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84499,13 +89316,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84519,13 +89336,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84539,13 +89356,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84559,13 +89376,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84580,13 +89397,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84600,13 +89417,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84620,13 +89437,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84640,13 +89457,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84660,13 +89477,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84680,13 +89497,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84700,13 +89517,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84720,13 +89537,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bank",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "atm",
-                    "building_area",
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84852,13 +89669,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84872,13 +89688,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84892,13 +89707,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84912,13 +89726,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84932,13 +89745,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84952,13 +89764,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84972,13 +89783,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -84992,13 +89802,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85012,13 +89821,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85032,13 +89840,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85052,13 +89859,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85072,13 +89878,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85092,13 +89897,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85112,13 +89916,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85132,13 +89935,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85152,13 +89954,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85172,13 +89973,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85192,13 +89992,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85212,13 +90011,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85232,13 +90030,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85252,13 +90049,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85272,13 +90068,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85292,13 +90087,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85312,13 +90106,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85332,13 +90125,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85352,13 +90144,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85372,13 +90163,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85392,13 +90182,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85412,13 +90201,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85432,13 +90220,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85452,13 +90239,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85472,13 +90258,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85492,13 +90277,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85512,13 +90296,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85532,13 +90315,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85552,13 +90334,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85572,13 +90353,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85592,13 +90372,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85612,13 +90391,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85632,13 +90410,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85652,13 +90429,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85672,13 +90448,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85692,13 +90467,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85712,13 +90486,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85732,13 +90505,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85752,73 +90524,50 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "amenity/pharmacy/Dr. Max": {
-                "tags": {
-                    "name": "Dr. Max",
-                    "amenity": "pharmacy"
-                },
-                "name": "Dr. Max",
-                "icon": "pharmacy",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
                     "building_area",
-                    "address",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Вита": {
+            "amenity/pharmacy/Dr. Max": {
                 "tags": {
-                    "name": "Вита",
+                    "name": "Dr. Max",
                     "amenity": "pharmacy"
                 },
-                "name": "Вита",
+                "name": "Dr. Max",
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/РадÑ\83га": {
+            "amenity/pharmacy/Ð\92иÑ\82а": {
                 "tags": {
-                    "name": "РадÑ\83га",
+                    "name": "Ð\92иÑ\82а",
                     "amenity": "pharmacy"
                 },
-                "name": "РадÑ\83га",
+                "name": "Ð\92иÑ\82а",
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85832,13 +90581,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85852,13 +90600,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85872,13 +90619,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85892,13 +90638,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85912,13 +90657,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85932,13 +90676,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85952,13 +90695,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85972,13 +90714,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -85992,13 +90733,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86012,13 +90752,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86032,13 +90771,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86052,13 +90790,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86072,13 +90809,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86092,13 +90828,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86112,13 +90847,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86132,13 +90866,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86152,13 +90885,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86172,13 +90904,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86192,13 +90923,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86212,13 +90942,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86232,13 +90961,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86252,13 +90980,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86272,13 +90999,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86292,13 +91018,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86312,13 +91037,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86332,13 +91056,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pharmacy",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -86353,14 +91076,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86375,14 +91097,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86397,14 +91118,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86419,14 +91139,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86441,14 +91160,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86463,14 +91181,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86485,14 +91202,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86507,14 +91223,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86530,14 +91245,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86552,14 +91266,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86574,14 +91287,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86596,14 +91308,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86618,14 +91329,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86640,14 +91350,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86663,14 +91372,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86685,14 +91393,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86707,14 +91414,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86729,14 +91435,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86752,14 +91457,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86774,14 +91478,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86796,14 +91499,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86818,14 +91520,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86840,14 +91541,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86862,14 +91562,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86884,14 +91583,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86906,14 +91604,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86929,14 +91626,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86951,14 +91647,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "cafe",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "cuisine",
                     "internet_access",
-                    "building_area",
                     "address",
+                    "building_area",
                     "opening_hours",
                     "smoking"
                 ],
@@ -86973,13 +91668,32 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/supermarket/Morrisons": {
+                "tags": {
+                    "name": "Morrisons",
+                    "shop": "supermarket"
+                },
+                "name": "Morrisons",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -86992,13 +91706,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87011,13 +91725,32 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/supermarket/Sainsbury's": {
+                "tags": {
+                    "name": "Sainsbury's",
+                    "shop": "supermarket"
+                },
+                "name": "Sainsbury's",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87030,13 +91763,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87049,13 +91782,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87068,13 +91801,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87087,13 +91820,51 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/supermarket/Coop": {
+                "tags": {
+                    "name": "Coop",
+                    "shop": "supermarket"
+                },
+                "name": "Coop",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/supermarket/Tesco": {
+                "tags": {
+                    "name": "Tesco",
+                    "shop": "supermarket"
+                },
+                "name": "Tesco",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87106,13 +91877,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87125,13 +91896,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87144,13 +91915,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87163,13 +91934,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87182,13 +91953,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87201,13 +91972,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87220,13 +91991,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87239,13 +92010,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87258,13 +92029,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87277,13 +92048,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87296,13 +92067,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87315,13 +92086,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87334,13 +92105,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87353,13 +92124,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87372,13 +92143,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87391,13 +92162,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87410,13 +92181,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87429,32 +92200,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
-            "shop/supermarket/Tesco Express": {
-                "tags": {
-                    "name": "Tesco Express",
-                    "shop": "supermarket"
-                },
-                "name": "Tesco Express",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87467,13 +92219,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87486,13 +92238,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87505,13 +92257,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87524,13 +92276,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87543,13 +92295,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87562,13 +92314,32 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/supermarket/Carrefour": {
+                "tags": {
+                    "name": "Carrefour",
+                    "shop": "supermarket"
+                },
+                "name": "Carrefour",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87581,13 +92352,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87600,13 +92371,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87619,13 +92390,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87638,13 +92409,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87657,13 +92428,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87676,13 +92447,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87695,13 +92466,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87714,13 +92485,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87733,13 +92504,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87752,13 +92523,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87771,13 +92542,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87790,13 +92561,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87809,13 +92580,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87828,13 +92599,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87847,13 +92618,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87866,13 +92637,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87885,13 +92656,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87904,13 +92675,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87923,13 +92694,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87942,13 +92713,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87961,13 +92732,32 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/supermarket/Super U": {
+                "tags": {
+                    "name": "Super U",
+                    "shop": "supermarket"
+                },
+                "name": "Super U",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87980,13 +92770,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -87999,13 +92789,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88018,13 +92808,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88037,13 +92827,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88056,13 +92846,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88075,13 +92865,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88094,13 +92884,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88113,13 +92903,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88132,13 +92922,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88151,13 +92941,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88170,13 +92960,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88189,32 +92979,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
-            "shop/supermarket/COOP Jednota": {
-                "tags": {
-                    "name": "COOP Jednota",
-                    "shop": "supermarket"
-                },
-                "name": "COOP Jednota",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88227,13 +92998,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88246,13 +93017,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88265,13 +93036,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88284,13 +93055,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88303,13 +93074,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88322,13 +93093,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88341,13 +93112,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88360,13 +93131,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88379,13 +93150,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88398,13 +93169,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88417,13 +93188,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88436,13 +93207,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88455,13 +93226,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88474,13 +93245,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88493,13 +93264,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88512,13 +93283,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88531,13 +93302,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88550,13 +93321,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88569,13 +93340,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88588,13 +93359,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88607,13 +93378,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88626,13 +93397,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88645,13 +93416,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88664,13 +93435,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88683,13 +93454,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88702,13 +93473,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88721,13 +93492,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88740,13 +93511,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88759,13 +93530,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88778,13 +93549,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88797,13 +93568,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88816,13 +93587,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88835,13 +93606,32 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/supermarket/Auchan": {
+                "tags": {
+                    "name": "Auchan",
+                    "shop": "supermarket"
+                },
+                "name": "Auchan",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88854,13 +93644,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88873,13 +93663,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88892,13 +93682,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88911,13 +93701,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88930,13 +93720,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88949,13 +93739,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88968,13 +93758,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -88987,89 +93777,89 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Costcutter": {
+            "shop/supermarket/Maxi": {
                 "tags": {
-                    "name": "Costcutter",
+                    "name": "Maxi",
                     "shop": "supermarket"
                 },
-                "name": "Costcutter",
+                "name": "Maxi",
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Maxi": {
+            "shop/supermarket/Colruyt": {
                 "tags": {
-                    "name": "Maxi",
+                    "name": "Colruyt",
                     "shop": "supermarket"
                 },
-                "name": "Maxi",
+                "name": "Colruyt",
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "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",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "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",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89082,13 +93872,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89101,13 +93891,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89120,13 +93910,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89139,13 +93929,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89158,13 +93948,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89177,13 +93967,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89196,13 +93986,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89215,13 +94005,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89234,32 +94024,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
-            "shop/supermarket/dm": {
-                "tags": {
-                    "name": "dm",
-                    "shop": "supermarket"
-                },
-                "name": "dm",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89272,13 +94043,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89291,13 +94062,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89310,13 +94081,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89329,13 +94100,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89348,13 +94119,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89367,13 +94138,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89386,13 +94157,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89405,13 +94176,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89424,13 +94195,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89443,13 +94214,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89462,13 +94233,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89481,13 +94252,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89500,32 +94271,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
-            "shop/supermarket/Petit Casino": {
-                "tags": {
-                    "name": "Petit Casino",
-                    "shop": "supermarket"
-                },
-                "name": "Petit Casino",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89538,13 +94290,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89557,13 +94309,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89576,13 +94328,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89595,13 +94347,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89614,13 +94366,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89633,13 +94385,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89652,13 +94404,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89671,13 +94423,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89690,13 +94442,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89709,13 +94461,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89728,13 +94480,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89747,13 +94499,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89766,13 +94518,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89785,13 +94537,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89804,13 +94556,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89823,13 +94575,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89842,13 +94594,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89861,13 +94613,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89880,13 +94632,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89899,13 +94651,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89918,13 +94670,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89937,13 +94689,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89956,13 +94708,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89975,13 +94727,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -89994,13 +94746,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90013,13 +94765,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90032,13 +94784,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90051,13 +94803,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90070,13 +94822,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90089,13 +94841,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90108,32 +94860,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
-            "shop/supermarket/Fressnapf": {
-                "tags": {
-                    "name": "Fressnapf",
-                    "shop": "supermarket"
-                },
-                "name": "Fressnapf",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90146,13 +94879,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90165,13 +94898,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90184,13 +94917,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90203,13 +94936,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90222,13 +94955,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90241,13 +94974,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90260,13 +94993,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90279,13 +95012,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90298,13 +95031,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90317,13 +95050,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90336,13 +95069,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90355,13 +95088,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90374,32 +95107,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
-            "shop/supermarket/Centra": {
-                "tags": {
-                    "name": "Centra",
-                    "shop": "supermarket"
-                },
-                "name": "Centra",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90412,13 +95126,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90431,13 +95145,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90450,13 +95164,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90469,13 +95183,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90488,13 +95202,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90507,13 +95221,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90526,13 +95240,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90545,13 +95259,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90564,13 +95278,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90583,13 +95297,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90602,13 +95316,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90621,13 +95335,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90640,13 +95354,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90659,13 +95373,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90678,13 +95392,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90697,13 +95411,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90716,13 +95430,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90735,13 +95449,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90754,13 +95468,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90773,13 +95487,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90792,13 +95506,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90811,13 +95525,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90830,13 +95544,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90849,13 +95563,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90868,13 +95582,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90887,13 +95601,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90906,13 +95620,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90925,13 +95639,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90944,13 +95658,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90963,13 +95677,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -90982,89 +95696,89 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "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",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "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",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Extra": {
+            "shop/supermarket/Полушка": {
                 "tags": {
-                    "name": "Extra",
+                    "name": "Полушка",
                     "shop": "supermarket"
                 },
-                "name": "Extra",
+                "name": "Полушка",
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Lewiatan": {
+            "shop/supermarket/Extra": {
                 "tags": {
-                    "name": "Lewiatan",
+                    "name": "Extra",
                     "shop": "supermarket"
                 },
-                "name": "Lewiatan",
+                "name": "Extra",
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91077,13 +95791,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91096,32 +95810,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
-            "shop/supermarket/Społem": {
-                "tags": {
-                    "name": "Społem",
-                    "shop": "supermarket"
-                },
-                "name": "Społem",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91134,13 +95829,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91153,13 +95848,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91172,13 +95867,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91191,32 +95886,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
-            "shop/supermarket/Магазин": {
-                "tags": {
-                    "name": "Магазин",
-                    "shop": "supermarket"
-                },
-                "name": "Магазин",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91229,13 +95905,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91248,13 +95924,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91267,13 +95943,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91286,13 +95962,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91305,13 +95981,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91324,13 +96000,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91343,13 +96019,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91362,13 +96038,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91381,13 +96057,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "grocery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
                     "operator",
+                    "address",
                     "building_area",
-                    "address"
+                    "opening_hours"
                 ],
                 "suggestion": true
             },
@@ -91400,10 +96076,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91419,10 +96095,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91438,10 +96114,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91457,10 +96133,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91476,10 +96152,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91495,10 +96171,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91514,10 +96190,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91533,10 +96209,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91552,10 +96228,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91571,10 +96247,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91590,10 +96266,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91609,10 +96285,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91628,10 +96304,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91647,10 +96323,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Tesco Express": {
+                "tags": {
+                    "name": "Tesco Express",
+                    "shop": "convenience"
+                },
+                "name": "Tesco Express",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91666,10 +96361,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91685,10 +96380,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/7-Eleven": {
+                "tags": {
+                    "name": "7-Eleven",
+                    "shop": "convenience"
+                },
+                "name": "7-Eleven",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91704,10 +96418,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91723,145 +96437,221 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/COOP Jednota": {
+                "tags": {
+                    "name": "COOP Jednota",
+                    "shop": "convenience"
+                },
+                "name": "COOP Jednota",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Mac's": {
+                "tags": {
+                    "name": "Mac's",
+                    "shop": "convenience"
+                },
+                "name": "Mac's",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Alepa": {
+                "tags": {
+                    "name": "Alepa",
+                    "shop": "convenience"
+                },
+                "name": "Alepa",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Hasty Market": {
+                "tags": {
+                    "name": "Hasty Market",
+                    "shop": "convenience"
+                },
+                "name": "Hasty Market",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Mac's": {
+            "shop/convenience/K-Market": {
                 "tags": {
-                    "name": "Mac's",
+                    "name": "K-Market",
                     "shop": "convenience"
                 },
-                "name": "Mac's",
+                "name": "K-Market",
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Alepa": {
+            "shop/convenience/Costcutter": {
                 "tags": {
-                    "name": "Alepa",
+                    "name": "Costcutter",
                     "shop": "convenience"
                 },
-                "name": "Alepa",
+                "name": "Costcutter",
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Hasty Market": {
+            "shop/convenience/Valintatalo": {
                 "tags": {
-                    "name": "Hasty Market",
+                    "name": "Valintatalo",
                     "shop": "convenience"
                 },
-                "name": "Hasty Market",
+                "name": "Valintatalo",
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/K-Market": {
+            "shop/convenience/Circle K": {
                 "tags": {
-                    "name": "K-Market",
+                    "name": "Circle K",
                     "shop": "convenience"
                 },
-                "name": "K-Market",
+                "name": "Circle K",
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/Valintatalo": {
+            "shop/convenience/セブンイレブン": {
                 "tags": {
-                    "name": "Valintatalo",
+                    "name": "セブンイレブン",
+                    "name:en": "7-Eleven",
                     "shop": "convenience"
                 },
-                "name": "Valintatalo",
+                "name": "セブンイレブン",
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ã\82»ã\83\96ã\83³ã\82¤ã\83¬ã\83\96ン": {
+            "shop/convenience/ã\83­ã\83¼ã\82½ン": {
                 "tags": {
-                    "name": "ã\82»ã\83\96ã\83³ã\82¤ã\83¬ã\83\96ン",
-                    "name:en": "7-Eleven",
+                    "name": "ã\83­ã\83¼ã\82½ン",
+                    "name:en": "LAWSON",
                     "shop": "convenience"
                 },
-                "name": "ã\82»ã\83\96ã\83³ã\82¤ã\83¬ã\83\96ン",
+                "name": "ã\83­ã\83¼ã\82½ン",
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/convenience/ローソン": {
+            "shop/convenience/Petit Casino": {
                 "tags": {
-                    "name": "ローソン",
-                    "name:en": "LAWSON",
+                    "name": "Petit Casino",
                     "shop": "convenience"
                 },
-                "name": "ローソン",
+                "name": "Petit Casino",
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91877,10 +96667,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91896,10 +96686,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91915,10 +96705,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91934,10 +96724,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91953,10 +96743,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91972,10 +96762,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -91991,10 +96781,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92010,10 +96800,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92029,10 +96819,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92048,10 +96838,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92067,10 +96857,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/ABC": {
+                "tags": {
+                    "name": "ABC",
+                    "shop": "convenience"
+                },
+                "name": "ABC",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92087,10 +96896,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92107,10 +96916,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92126,10 +96935,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92145,10 +96954,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92164,10 +96973,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92183,10 +96992,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92202,10 +97011,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92221,10 +97030,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92241,10 +97050,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92260,10 +97069,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92279,10 +97088,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92298,10 +97107,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Магазин": {
+                "tags": {
+                    "name": "Магазин",
+                    "shop": "convenience"
+                },
+                "name": "Магазин",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92317,10 +97145,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92336,10 +97164,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Centra": {
+                "tags": {
+                    "name": "Centra",
+                    "shop": "convenience"
+                },
+                "name": "Centra",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92356,10 +97203,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Wawa": {
+                "tags": {
+                    "name": "Wawa",
+                    "shop": "convenience"
+                },
+                "name": "Wawa",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92375,10 +97241,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92394,10 +97260,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92413,10 +97279,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92432,10 +97298,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92451,10 +97317,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92470,10 +97336,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92489,10 +97355,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92508,10 +97374,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92527,10 +97393,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Społem": {
+                "tags": {
+                    "name": "Społem",
+                    "shop": "convenience"
+                },
+                "name": "Społem",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92546,10 +97431,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92565,10 +97450,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Kiosk": {
+                "tags": {
+                    "name": "Kiosk",
+                    "shop": "convenience"
+                },
+                "name": "Kiosk",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92584,10 +97488,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92603,10 +97507,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92622,10 +97526,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92641,10 +97545,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92660,10 +97564,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Stewart's": {
+                "tags": {
+                    "name": "Stewart's",
+                    "shop": "convenience"
+                },
+                "name": "Stewart's",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92679,10 +97602,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92698,10 +97621,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Радуга": {
+                "tags": {
+                    "name": "Радуга",
+                    "shop": "convenience"
+                },
+                "name": "Радуга",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92717,10 +97659,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92736,10 +97678,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92755,10 +97697,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92774,10 +97716,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92793,10 +97735,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92812,10 +97754,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92831,10 +97773,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92850,10 +97792,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92869,10 +97811,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92888,10 +97830,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92907,10 +97849,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92926,10 +97868,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92945,10 +97887,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92964,10 +97906,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -92983,10 +97925,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93002,10 +97944,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93021,10 +97963,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93040,10 +97982,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93059,10 +98001,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93078,10 +98020,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Lewiatan": {
+                "tags": {
+                    "name": "Lewiatan",
+                    "shop": "convenience"
+                },
+                "name": "Lewiatan",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93097,10 +98058,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93116,10 +98077,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93135,10 +98096,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93154,10 +98115,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93173,10 +98134,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93192,10 +98153,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93211,10 +98172,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93230,10 +98191,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93249,10 +98210,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93268,10 +98229,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93287,10 +98248,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93306,10 +98267,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/convenience/Boutique": {
+                "tags": {
+                    "name": "Boutique",
+                    "shop": "convenience"
+                },
+                "name": "Boutique",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93325,10 +98305,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93344,10 +98324,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/chemist/dm": {
+                "tags": {
+                    "name": "dm",
+                    "shop": "chemist"
+                },
+                "name": "dm",
+                "icon": "chemist",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93360,13 +98359,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Müller",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93379,13 +98378,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Schlecker",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93398,13 +98397,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Etos",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93417,13 +98416,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Bipa",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93436,13 +98435,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Rossmann",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93455,13 +98454,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "DM Drogeriemarkt",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93474,13 +98473,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Ihr Platz",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93493,13 +98492,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Douglas",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93512,32 +98511,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "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",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93550,13 +98530,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Kwik Fit",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93569,13 +98549,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "ATU",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93588,13 +98568,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Kwik-Fit",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93607,13 +98587,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Midas",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93626,89 +98606,51 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Feu Vert",
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "shop/car_repair/Norauto": {
-                "tags": {
-                    "name": "Norauto",
-                    "shop": "car_repair"
-                },
-                "name": "Norauto",
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "shop/car_repair/Speedy": {
-                "tags": {
-                    "name": "Speedy",
-                    "shop": "car_repair"
-                },
-                "name": "Speedy",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Автозапчасти": {
+            "shop/car_repair/Norauto": {
                 "tags": {
-                    "name": "Автозапчасти",
+                    "name": "Norauto",
                     "shop": "car_repair"
                 },
-                "name": "Автозапчасти",
-                "icon": "shop",
+                "name": "Norauto",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
             },
-            "shop/car_repair/Renault": {
+            "shop/car_repair/Speedy": {
                 "tags": {
-                    "name": "Renault",
+                    "name": "Speedy",
                     "shop": "car_repair"
                 },
-                "name": "Renault",
-                "icon": "shop",
+                "name": "Speedy",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93721,13 +98663,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Pit Stop",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93740,13 +98682,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Jiffy Lube",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93759,13 +98701,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Шиномонтаж",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93778,13 +98720,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "СТО",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93797,13 +98739,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "O'Reilly Auto Parts",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93816,13 +98758,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Carglass",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93835,32 +98777,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "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",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93873,13 +98796,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Euromaster",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93892,13 +98815,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Firestone",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93911,13 +98834,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "AutoZone",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93930,13 +98853,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Автосервис",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93949,13 +98872,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Advance Auto Parts",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93968,13 +98891,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Roady",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -93990,10 +98913,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94009,10 +98932,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94028,10 +98951,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94047,10 +98970,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94066,10 +98989,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94085,10 +99008,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94104,10 +99027,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94123,10 +99046,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94142,10 +99065,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94161,10 +99084,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94180,10 +99103,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94199,10 +99122,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94218,10 +99141,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94237,10 +99160,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94256,10 +99179,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94275,10 +99198,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94294,10 +99217,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94313,10 +99236,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94332,10 +99255,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94351,10 +99274,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94370,10 +99293,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94389,10 +99312,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94408,10 +99331,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94427,10 +99350,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94446,10 +99369,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94465,10 +99388,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/doityourself/Canadian Tire": {
+                "tags": {
+                    "name": "Canadian Tire",
+                    "shop": "doityourself"
+                },
+                "name": "Canadian Tire",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94484,10 +99426,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94503,10 +99445,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94522,10 +99464,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94541,10 +99483,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94560,10 +99502,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94579,10 +99521,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94598,10 +99540,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94617,10 +99559,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94636,10 +99578,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94655,10 +99597,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94674,10 +99616,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94693,29 +99635,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "shop/doityourself/Хозтовары": {
-                "tags": {
-                    "name": "Хозтовары",
-                    "shop": "doityourself"
-                },
-                "name": "Хозтовары",
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94731,10 +99654,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94750,10 +99673,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94769,10 +99692,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94788,10 +99711,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94807,10 +99730,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94826,10 +99749,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94845,10 +99768,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -94864,11 +99787,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -94882,11 +99806,50 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/car/Citroen": {
+                "tags": {
+                    "name": "Citroen",
+                    "shop": "car"
+                },
+                "name": "Citroen",
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/car/Renault": {
+                "tags": {
+                    "name": "Renault",
+                    "shop": "car"
+                },
+                "name": "Renault",
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -94900,11 +99863,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -94918,11 +99882,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -94936,11 +99901,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -94954,11 +99920,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -94972,11 +99939,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -94990,11 +99958,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95008,11 +99977,31 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/car/Автозапчасти": {
+                "tags": {
+                    "name": "Автозапчасти",
+                    "shop": "car"
+                },
+                "name": "Автозапчасти",
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95026,11 +100015,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95044,11 +100034,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95062,11 +100053,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95080,11 +100072,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95098,11 +100091,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95116,11 +100110,31 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/car/Peugeot": {
+                "tags": {
+                    "name": "Peugeot",
+                    "shop": "car"
+                },
+                "name": "Peugeot",
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95134,11 +100148,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95152,11 +100167,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95170,11 +100186,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95188,11 +100205,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "car",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "suggestion": true
@@ -95206,10 +100224,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95225,10 +100243,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95244,10 +100262,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95263,10 +100281,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95282,10 +100300,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95301,10 +100319,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95320,10 +100338,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95339,10 +100357,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95358,10 +100376,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95377,10 +100395,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95396,10 +100414,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95415,10 +100433,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95434,10 +100452,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95453,10 +100471,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95472,10 +100490,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95491,10 +100509,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95510,10 +100528,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95529,10 +100547,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95548,10 +100566,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95567,10 +100585,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95586,10 +100604,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95605,10 +100623,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95624,10 +100642,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95643,10 +100661,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95662,29 +100680,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "shop/clothes/Deichmann": {
-                "tags": {
-                    "name": "Deichmann",
-                    "shop": "clothes"
-                },
-                "name": "Deichmann",
-                "icon": "clothing-store",
-                "geometry": [
-                    "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95700,10 +100699,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95719,10 +100718,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95738,10 +100737,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95757,10 +100756,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95776,10 +100775,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95795,10 +100794,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95814,10 +100813,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95833,10 +100832,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95852,10 +100851,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95871,10 +100870,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95890,10 +100889,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95909,10 +100908,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95928,10 +100927,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95947,10 +100946,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95966,10 +100965,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -95985,10 +100984,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96004,10 +101003,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96023,10 +101022,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96042,10 +101041,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96061,10 +101060,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96080,10 +101079,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96099,10 +101098,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96118,10 +101117,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96137,10 +101136,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96156,10 +101155,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96175,10 +101174,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96194,10 +101193,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96213,10 +101212,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96232,10 +101231,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96251,10 +101250,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96270,10 +101269,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96289,10 +101288,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96308,10 +101307,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96327,10 +101326,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96346,10 +101345,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96365,10 +101364,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96384,10 +101383,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96403,10 +101402,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96422,10 +101421,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96441,10 +101440,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96460,10 +101459,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96479,10 +101478,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96498,10 +101497,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96517,10 +101516,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96536,10 +101535,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96555,10 +101554,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96574,10 +101573,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96593,10 +101592,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96612,10 +101611,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "clothing-store",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96631,10 +101630,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96650,10 +101649,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96669,10 +101668,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96688,10 +101687,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96707,10 +101706,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96726,10 +101725,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96745,10 +101744,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96764,10 +101763,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96783,10 +101782,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96802,10 +101801,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96821,10 +101820,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96840,10 +101839,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96859,10 +101858,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96878,10 +101877,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96897,10 +101896,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96916,10 +101915,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96935,10 +101934,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96954,10 +101953,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96973,10 +101972,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -96992,10 +101991,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97011,10 +102010,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97030,10 +102029,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97049,10 +102048,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97068,10 +102067,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97087,10 +102086,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97106,10 +102105,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97125,10 +102124,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97144,10 +102143,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97163,10 +102162,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97182,10 +102181,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97201,10 +102200,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97220,10 +102219,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "alcohol-shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97239,10 +102238,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97258,10 +102257,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97277,10 +102276,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97296,10 +102295,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97315,10 +102314,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97334,10 +102333,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97353,10 +102352,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97372,10 +102371,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97391,10 +102390,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97410,10 +102409,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97429,10 +102428,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97448,10 +102447,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97467,10 +102466,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97486,10 +102485,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97505,10 +102504,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97524,10 +102523,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97543,10 +102542,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97562,10 +102561,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97581,10 +102580,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97600,10 +102599,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97619,10 +102618,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97638,10 +102637,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97657,10 +102656,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97676,10 +102675,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97695,10 +102694,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97714,10 +102713,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97733,10 +102732,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97752,10 +102751,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bakery",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97771,10 +102770,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97790,10 +102789,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97809,10 +102808,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97828,10 +102827,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97847,10 +102846,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97866,10 +102865,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97885,10 +102884,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97904,10 +102903,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97923,10 +102922,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97942,10 +102941,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97961,10 +102960,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/pet/Fressnapf": {
+                "tags": {
+                    "name": "Fressnapf",
+                    "shop": "pet"
+                },
+                "name": "Fressnapf",
+                "icon": "dog-park",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97980,10 +102998,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "dog-park",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -97999,10 +103017,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "dog-park",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98018,10 +103036,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "dog-park",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98037,10 +103055,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "dog-park",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98056,10 +103074,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "dog-park",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/shoes/Deichmann": {
+                "tags": {
+                    "name": "Deichmann",
+                    "shop": "shoes"
+                },
+                "name": "Deichmann",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98075,10 +103112,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98094,10 +103131,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98113,10 +103150,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98132,10 +103169,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98151,10 +103188,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98170,10 +103207,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98189,10 +103226,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98208,10 +103245,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98227,10 +103264,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98246,10 +103283,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98265,10 +103302,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98284,10 +103321,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98303,10 +103340,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98322,10 +103359,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98341,10 +103378,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98360,10 +103397,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98379,10 +103416,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98398,10 +103435,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98417,10 +103454,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98436,10 +103473,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98455,10 +103492,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "suitcase",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98474,10 +103511,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "suitcase",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98493,10 +103530,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98512,10 +103549,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98531,10 +103568,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98550,10 +103587,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98569,10 +103606,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98588,10 +103625,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98607,10 +103644,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98626,10 +103663,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98645,10 +103682,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98664,10 +103701,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98683,10 +103720,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98702,10 +103739,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98721,10 +103758,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98740,10 +103777,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98756,13 +103793,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Билайн",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98775,13 +103812,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "ソフトバンクショップ (SoftBank shop)",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98794,13 +103831,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Vodafone",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98813,13 +103850,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "O2",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98832,13 +103869,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Carphone Warehouse",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98851,13 +103888,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Orange",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98870,13 +103907,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Verizon Wireless",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98889,13 +103926,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Sprint",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98908,13 +103945,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "T-Mobile",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98927,13 +103964,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "МТС",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98946,13 +103983,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Евросеть",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98965,13 +104002,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Bell",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -98984,13 +104021,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "The Phone House",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99003,13 +104040,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "SFR",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99022,13 +104059,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Связной",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99041,13 +104078,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Мегафон",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99060,13 +104097,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "AT&T",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99079,13 +104116,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "ドコモショップ (docomo shop)",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99098,13 +104135,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "au",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99117,13 +104154,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Movistar",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99136,13 +104173,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Bitė",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99158,10 +104195,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99177,10 +104214,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99193,13 +104230,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Klier",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99212,13 +104249,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Supercuts",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99231,13 +104268,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Hairkiller",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99250,13 +104287,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Great Clips",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99269,13 +104306,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Парикмахерская",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99288,13 +104325,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Стиль",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99307,13 +104344,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Fryzjer",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99326,13 +104363,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Franck Provost",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99345,13 +104382,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Салон красоты",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99367,10 +104404,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "shop",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/hardware/Хозтовары": {
+                "tags": {
+                    "name": "Хозтовары",
+                    "shop": "hardware"
+                },
+                "name": "Хозтовары",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99383,13 +104439,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "motorcycle"
                 },
                 "name": "Yamaha",
-                "icon": "shop",
+                "icon": "scooter",
                 "geometry": [
                     "point",
-                    "vertex",
                     "area"
                 ],
                 "fields": [
+                    "operator",
                     "address",
                     "building_area",
                     "opening_hours"
@@ -99429,7 +104485,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "point"
             ],
             "vertex": [
-                "highway/crossing",
+                "highway/crosswalk",
                 "railway/level_crossing",
                 "highway/traffic_signals",
                 "highway/turning_circle",
@@ -99439,8 +104495,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             ],
             "relation": [
                 "category-route",
+                "category-restriction",
                 "type/boundary",
-                "type/restriction",
                 "type/multipolygon",
                 "relation"
             ]
@@ -99486,7 +104542,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "landuse/farmyard",
                     "landuse/forest",
                     "landuse/meadow",
-                    "landuse/cemetery"
+                    "landuse/cemetery",
+                    "landuse/military"
                 ]
             },
             "category-path": {
@@ -99514,6 +104571,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "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",
@@ -99589,6 +104661,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "bicycle",
                     "horse"
                 ],
+                "reference": {
+                    "key": "access"
+                },
                 "type": "access",
                 "label": "Access",
                 "placeholder": "Unknown",
@@ -99629,6 +104704,18 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 }
             },
             "access_simple": {
+                "key": "access",
+                "type": "combo",
+                "label": "Access",
+                "placeholder": "yes",
+                "options": [
+                    "permissive",
+                    "private",
+                    "customers",
+                    "no"
+                ]
+            },
+            "access_toilets": {
                 "key": "access",
                 "type": "combo",
                 "label": "Access",
@@ -99642,20 +104729,33 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "address": {
                 "type": "address",
                 "keys": [
+                    "addr:housename",
                     "addr:housenumber",
                     "addr:street",
                     "addr:city",
                     "addr:postcode"
                 ],
+                "reference": {
+                    "key": "addr"
+                },
                 "icon": "address",
                 "universal": true,
                 "label": "Address",
                 "strings": {
                     "placeholders": {
-                        "number": "123",
+                        "housename": "Housename",
+                        "housenumber": "123",
                         "street": "Street",
                         "city": "City",
-                        "postcode": "Postal code"
+                        "postcode": "Postcode",
+                        "place": "Place",
+                        "hamlet": "Hamlet",
+                        "suburb": "Suburb",
+                        "subdistrict": "Subdistrict",
+                        "district": "District",
+                        "province": "Province",
+                        "state": "State",
+                        "country": "Country"
                     }
                 }
             },
@@ -99672,12 +104772,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "aerialway/access": {
                 "key": "aerialway:access",
                 "type": "combo",
-                "options": [
-                    "entry",
-                    "exit",
-                    "both"
-                ],
-                "label": "Access"
+                "label": "Access",
+                "strings": {
+                    "options": {
+                        "entry": "Entry",
+                        "exit": "Exit",
+                        "both": "Both"
+                    }
+                }
             },
             "aerialway/bubble": {
                 "key": "aerialway:bubble",
@@ -99710,12 +104812,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "aerialway/summer/access": {
                 "key": "aerialway:summer:access",
                 "type": "combo",
-                "options": [
-                    "entry",
-                    "exit",
-                    "both"
-                ],
-                "label": "Access (summer)"
+                "label": "Access (summer)",
+                "strings": {
+                    "options": {
+                        "entry": "Entry",
+                        "exit": "Exit",
+                        "both": "Both"
+                    }
+                }
             },
             "aeroway": {
                 "key": "aeroway",
@@ -99769,7 +104873,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "building_area": {
                 "key": "building",
-                "type": "check",
+                "type": "defaultcheck",
                 "default": "yes",
                 "geometry": "area",
                 "label": "Building"
@@ -99783,32 +104887,31 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "cardinal_direction": {
                 "key": "direction",
                 "type": "combo",
-                "options": [
-                    "N",
-                    "E",
-                    "S",
-                    "W",
-                    "NE",
-                    "SE",
-                    "SW",
-                    "NNE",
-                    "ENE",
-                    "ESE",
-                    "SSE",
-                    "SSW",
-                    "WSW",
-                    "WNW",
-                    "NNW"
-                ],
-                "label": "Direction"
+                "label": "Direction",
+                "strings": {
+                    "options": {
+                        "N": "North",
+                        "E": "East",
+                        "S": "South",
+                        "W": "West",
+                        "NE": "Northeast",
+                        "SE": "Southeast",
+                        "SW": "Southwest",
+                        "NW": "Northwest",
+                        "NNE": "North-northeast",
+                        "ENE": "East-northeast",
+                        "ESE": "East-southeast",
+                        "SSE": "South-southeast",
+                        "SSW": "South-southwest",
+                        "WSW": "West-southwest",
+                        "WNW": "West-northwest",
+                        "NNW": "North-northwest"
+                    }
+                }
             },
             "clock_direction": {
                 "key": "direction",
                 "type": "combo",
-                "options": [
-                    "clockwise",
-                    "anticlockwise"
-                ],
                 "label": "Direction",
                 "strings": {
                     "options": {
@@ -99837,6 +104940,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "check",
                 "label": "Covered"
             },
+            "craft": {
+                "key": "craft",
+                "type": "typeCombo",
+                "label": "Type"
+            },
             "crop": {
                 "key": "crop",
                 "type": "combo",
@@ -99850,7 +104958,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "cuisine": {
                 "key": "cuisine",
                 "type": "combo",
-                "indexed": true,
                 "label": "Cuisine"
             },
             "denomination": {
@@ -99872,12 +104979,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "key": "electrified",
                 "type": "combo",
                 "label": "Electrification",
-                "options": [
-                    "contact_line",
-                    "rail",
-                    "yes",
-                    "no"
-                ]
+                "placeholder": "Contact Line, Electrified Rail...",
+                "strings": {
+                    "options": {
+                        "contact_line": "Contact Line",
+                        "rail": "Electrified Rail",
+                        "yes": "Yes (unspecified)",
+                        "no": "No"
+                    }
+                }
             },
             "elevation": {
                 "key": "ele",
@@ -99896,6 +105006,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "except": {
+                "key": "except",
+                "type": "combo",
+                "label": "Exceptions"
+            },
             "fax": {
                 "key": "fax",
                 "type": "tel",
@@ -99910,13 +105025,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "fire_hydrant/type": {
                 "key": "fire_hydrant:type",
                 "type": "combo",
-                "options": [
-                    "pillar",
-                    "pond",
-                    "underground",
-                    "wall"
-                ],
-                "label": "Type"
+                "label": "Type",
+                "strings": {
+                    "options": {
+                        "pillar": "Pillar/Aboveground",
+                        "underground": "Underground",
+                        "wall": "Wall",
+                        "pond": "Pond"
+                    }
+                }
             },
             "fixme": {
                 "key": "fixme",
@@ -99928,6 +105045,51 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "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",
@@ -99999,13 +105161,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "internet_access": {
                 "key": "internet_access",
                 "type": "combo",
-                "options": [
-                    "yes",
-                    "no",
-                    "wlan",
-                    "wired",
-                    "terminal"
-                ],
                 "label": "Internet Access",
                 "strings": {
                     "options": {
@@ -100017,6 +105172,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     }
                 }
             },
+            "lamp_type": {
+                "key": "lamp_type",
+                "type": "combo",
+                "label": "Type"
+            },
             "landuse": {
                 "key": "landuse",
                 "type": "typeCombo",
@@ -100038,6 +105198,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "length": {
+                "key": "length",
+                "type": "number",
+                "label": "Length (Meters)"
+            },
             "levels": {
                 "key": "building:levels",
                 "type": "number",
@@ -100065,6 +105230,54 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "label": "Speed Limit",
                 "placeholder": "40, 50, 60..."
             },
+            "mtb/scale": {
+                "key": "mtb:scale",
+                "type": "combo",
+                "label": "Mountain Biking Difficulty",
+                "placeholder": "0, 1, 2, 3...",
+                "strings": {
+                    "options": {
+                        "0": "0: Solid gravel/packed earth, no obstacles, wide curves",
+                        "1": "1: Some loose surface, small obstacles, wide curves",
+                        "2": "2: Much loose surface, large obstacles, easy hairpins",
+                        "3": "3: Slippery surface, large obstacles, tight hairpins",
+                        "4": "4: Loose surface or boulders, dangerous hairpins",
+                        "5": "5: Maximum difficulty, boulder fields, landslides",
+                        "6": "6: Not rideable except by the very best mountain bikers"
+                    }
+                }
+            },
+            "mtb/scale/imba": {
+                "key": "mtb:scale:imba",
+                "type": "combo",
+                "label": "IMBA Trail Difficulty",
+                "placeholder": "Easy, Medium, Difficult...",
+                "strings": {
+                    "options": {
+                        "0": "Easiest (white circle)",
+                        "1": "Easy (green circle)",
+                        "2": "Medium (blue square)",
+                        "3": "Difficult (black diamond)",
+                        "4": "Extremely Difficult (double black diamond)"
+                    }
+                }
+            },
+            "mtb/scale/uphill": {
+                "key": "mtb:scale:uphill",
+                "type": "combo",
+                "label": "Mountain Biking Uphill Difficulty",
+                "placeholder": "0, 1, 2, 3...",
+                "strings": {
+                    "options": {
+                        "0": "0: Avg. incline <10%, gravel/packed earth, no obstacles",
+                        "1": "1: Avg. incline <15%, gravel/packed earth, few small objects",
+                        "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots",
+                        "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches",
+                        "4": "4: Avg. incline <30%, poor condition, big rocks/branches",
+                        "5": "5: Very steep, bike generally needs to be pushed or carried"
+                    }
+                }
+            },
             "name": {
                 "key": "name",
                 "type": "localized",
@@ -100096,13 +105309,26 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "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",
@@ -100128,16 +105354,18 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "parking": {
                 "key": "parking",
                 "type": "combo",
-                "options": [
-                    "surface",
-                    "multi-storey",
-                    "underground",
-                    "sheds",
-                    "carports",
-                    "garage_boxes",
-                    "lane"
-                ],
-                "label": "Type"
+                "label": "Type",
+                "strings": {
+                    "options": {
+                        "surface": "Surface",
+                        "multi-storey": "Multilevel",
+                        "underground": "Underground",
+                        "sheds": "Sheds",
+                        "carports": "Carports",
+                        "garage_boxes": "Garage Boxes",
+                        "lane": "Roadside Lane"
+                    }
+                }
             },
             "phone": {
                 "key": "phone",
@@ -100150,23 +105378,63 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "piste/difficulty": {
                 "key": "piste:difficulty",
                 "type": "combo",
-                "label": "Difficulty"
+                "label": "Difficulty",
+                "placeholder": "Easy, Intermediate, Advanced...",
+                "strings": {
+                    "options": {
+                        "novice": "Novice (instructional)",
+                        "easy": "Easy (green circle)",
+                        "intermediate": "Intermediate (blue square)",
+                        "advanced": "Advanced (black diamond)",
+                        "expert": "Expert (double black diamond)",
+                        "freeride": "Freeride (off-piste)",
+                        "extreme": "Extreme (climbing equipment required)"
+                    }
+                }
             },
             "piste/grooming": {
                 "key": "piste:grooming",
                 "type": "combo",
-                "label": "Grooming"
+                "label": "Grooming",
+                "strings": {
+                    "options": {
+                        "classic": "Classic",
+                        "mogul": "Mogul",
+                        "backcountry": "Backcountry",
+                        "classic+skating": "Classic and Skating",
+                        "scooter": "Scooter/Snowmobile",
+                        "skating": "Skating"
+                    }
+                }
             },
             "piste/type": {
                 "key": "piste:type",
                 "type": "typeCombo",
-                "label": "Type"
+                "label": "Type",
+                "strings": {
+                    "options": {
+                        "downhill": "Downhill",
+                        "nordic": "Nordic",
+                        "skitour": "Skitour",
+                        "sled": "Sled",
+                        "hike": "Hike",
+                        "sleigh": "Sleigh",
+                        "ice_skate": "Ice Skate",
+                        "snow_park": "Snow Park",
+                        "playground": "Playground"
+                    }
+                }
             },
             "place": {
                 "key": "place",
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "population": {
+                "key": "population",
+                "type": "text",
+                "label": "Population"
+            },
             "power": {
                 "key": "power",
                 "type": "typeCombo",
@@ -100210,33 +105478,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "religion": {
                 "key": "religion",
                 "type": "combo",
-                "options": [
-                    "christian",
-                    "muslim",
-                    "buddhist",
-                    "jewish",
-                    "hindu",
-                    "shinto",
-                    "taoist"
-                ],
-                "label": "Religion",
-                "strings": {
-                    "options": {
-                        "christian": "Christian",
-                        "muslim": "Muslim",
-                        "buddhist": "Buddhist",
-                        "jewish": "Jewish",
-                        "hindu": "Hindu",
-                        "shinto": "Shinto",
-                        "taoist": "Taoist"
-                    }
-                }
+                "label": "Religion"
             },
             "restriction": {
                 "key": "restriction",
                 "type": "combo",
                 "label": "Type"
             },
+            "restrictions": {
+                "type": "restrictions",
+                "geometry": "vertex",
+                "icon": "restrictions",
+                "reference": {
+                    "rtype": "restriction"
+                },
+                "label": "Turn Restrictions"
+            },
             "route": {
                 "key": "route",
                 "type": "combo",
@@ -100250,7 +105507,18 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "sac_scale": {
                 "key": "sac_scale",
                 "type": "combo",
-                "label": "Path Difficulty"
+                "label": "Hiking Difficulty",
+                "placeholder": "Mountain Hiking, Alpine Hiking...",
+                "strings": {
+                    "options": {
+                        "hiking": "T1: Hiking",
+                        "mountain_hiking": "T2: Mountain Hiking",
+                        "demanding_mountain_hiking": "T3: Demanding Mountain Hiking",
+                        "alpine_hiking": "T4: Alpine Hiking",
+                        "demanding_alpine_hiking": "T5: Demanding Alpine Hiking",
+                        "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"
+                    }
+                }
             },
             "seasonal": {
                 "key": "seasonal",
@@ -100260,14 +105528,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "service": {
                 "key": "service",
                 "type": "combo",
+                "label": "Type",
                 "options": [
                     "parking_aisle",
                     "driveway",
                     "alley",
-                    "drive-through",
-                    "emergency_access"
-                ],
-                "label": "Type"
+                    "emergency_access",
+                    "drive-through"
+                ]
             },
             "shelter": {
                 "key": "shelter",
@@ -100277,15 +105545,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "shelter_type": {
                 "key": "shelter_type",
                 "type": "combo",
-                "options": [
-                    "public_transport",
-                    "picnic_shelter",
-                    "weather_shelter",
-                    "lean_to",
-                    "basic_hut",
-                    "field_shelter",
-                    "rock_shelter"
-                ],
                 "label": "Type"
             },
             "shop": {
@@ -100293,16 +105552,44 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "sloped_curb": {
+                "key": "sloped_curb",
+                "type": "combo",
+                "label": "Sloped Curb"
+            },
             "smoking": {
                 "key": "smoking",
                 "type": "combo",
-                "options": [
-                    "no",
-                    "outside",
-                    "separated",
-                    "yes"
-                ],
-                "label": "Smoking"
+                "label": "Smoking",
+                "placeholder": "No, Separated, Yes...",
+                "strings": {
+                    "options": {
+                        "no": "No smoking anywhere",
+                        "separated": "In smoking areas, not physically isolated",
+                        "isolated": "In smoking areas, physically isolated",
+                        "outside": "Allowed outside",
+                        "yes": "Allowed everywhere",
+                        "dedicated": "Dedicated to smokers (e.g. smokers' club)"
+                    }
+                }
+            },
+            "smoothness": {
+                "key": "smoothness",
+                "type": "combo",
+                "label": "Smoothness",
+                "placeholder": "Thin Rollers, Wheels, Off-Road...",
+                "strings": {
+                    "options": {
+                        "excellent": "Thin Rollers: rollerblade, skateboard",
+                        "good": "Thin Wheels: racing bike",
+                        "intermediate": "Wheels: city bike, wheelchair, scooter",
+                        "bad": "Robust Wheels: trekking bike, car, rickshaw",
+                        "very_bad": "High Clearance: light duty off-road vehicle",
+                        "horrible": "Off-Road: heavy duty off-road vehicle",
+                        "very_horrible": "Specialized off-road: tractor, ATV",
+                        "impassible": "Impassible / No wheeled vehicle"
+                    }
+                }
             },
             "social_facility_for": {
                 "key": "social_facility:for",
@@ -100341,14 +105628,28 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "sport_ice": {
                 "key": "sport",
                 "type": "combo",
+                "label": "Sport",
                 "options": [
                     "skating",
                     "hockey",
                     "multi",
                     "curling",
                     "ice_stock"
-                ],
-                "label": "Sport"
+                ]
+            },
+            "sport_racing": {
+                "key": "sport",
+                "type": "combo",
+                "label": "Sport",
+                "options": [
+                    "cycling",
+                    "dog_racing",
+                    "horse_racing",
+                    "karting",
+                    "motor",
+                    "motocross",
+                    "running"
+                ]
             },
             "structure": {
                 "type": "radio",
@@ -100356,7 +105657,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "bridge",
                     "tunnel",
                     "embankment",
-                    "cutting"
+                    "cutting",
+                    "ford"
                 ],
                 "label": "Structure",
                 "placeholder": "Unknown",
@@ -100365,18 +105667,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "bridge": "Bridge",
                         "tunnel": "Tunnel",
                         "embankment": "Embankment",
-                        "cutting": "Cutting"
+                        "cutting": "Cutting",
+                        "ford": "Ford"
                     }
                 }
             },
             "studio_type": {
                 "key": "type",
                 "type": "combo",
+                "label": "Type",
                 "options": [
                     "audio",
                     "video"
-                ],
-                "label": "Type"
+                ]
             },
             "supervised": {
                 "key": "supervised",
@@ -100388,10 +105691,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "combo",
                 "label": "Surface"
             },
+            "tactile_paving": {
+                "key": "tactile_paving",
+                "type": "check",
+                "label": "Tactile Paving"
+            },
             "toilets/disposal": {
                 "key": "toilets:disposal",
                 "type": "combo",
-                "label": "Disposal"
+                "label": "Disposal",
+                "strings": {
+                    "options": {
+                        "flush": "Flush",
+                        "pitlatrine": "Pit/Latrine",
+                        "chemical": "Chemical",
+                        "bucket": "Bucket"
+                    }
+                }
             },
             "tourism": {
                 "key": "tourism",
@@ -100406,22 +105722,43 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "tracktype": {
                 "key": "tracktype",
                 "type": "combo",
-                "label": "Type"
+                "label": "Track Type",
+                "placeholder": "Solid, Mostly Solid, Soft...",
+                "strings": {
+                    "options": {
+                        "grade1": "Solid: paved or heavily compacted hardcore surface",
+                        "grade2": "Mostly Solid: gravel/rock with some soft material mixed in",
+                        "grade3": "Even mixture of hard and soft materials",
+                        "grade4": "Mostly Soft: soil/sand/grass with some hard material mixed in",
+                        "grade5": "Soft: soil/sand/grass"
+                    }
+                }
             },
             "trail_visibility": {
                 "key": "trail_visibility",
                 "type": "combo",
-                "label": "Trail Visibility"
+                "label": "Trail Visibility",
+                "placeholder": "Excellent, Good, Bad...",
+                "strings": {
+                    "options": {
+                        "excellent": "Excellent: unambiguous path or markers everywhere",
+                        "good": "Good: markers visible, sometimes require searching",
+                        "intermediate": "Intermediate: few markers, path mostly visible",
+                        "bad": "Bad: no markers, path sometimes invisible/pathless",
+                        "horrible": "Horrible: often pathless, some orientation skills required",
+                        "no": "No: pathless, excellent orientation skills required"
+                    }
+                }
             },
             "tree_type": {
                 "key": "type",
                 "type": "combo",
+                "label": "Type",
                 "options": [
                     "broad_leaved",
                     "conifer",
                     "palm"
-                ],
-                "label": "Type"
+                ]
             },
             "trees": {
                 "key": "trees",
@@ -100473,6 +105810,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "universal": true,
                 "label": "Wheelchair Access"
             },
+            "width": {
+                "key": "width",
+                "type": "number",
+                "label": "Width (Meters)"
+            },
             "wikipedia": {
                 "key": "wikipedia",
                 "type": "wikipedia",
@@ -111903,6 +117245,90 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 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
+            ]
+        },
+        "gift": {
+            "12": [
+                258,
+                528
+            ],
+            "18": [
+                240,
+                528
+            ],
+            "24": [
+                216,
+                528
+            ]
+        },
+        "ice-cream": {
+            "12": [
+                42,
+                552
+            ],
+            "18": [
+                24,
+                552
+            ],
+            "24": [
+                0,
+                552
+            ]
+        },
         "highway-motorway": {
             "line": [
                 20,
@@ -112226,6 +117652,48 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 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": {
@@ -112324,11 +117792,36 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "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": [
         "af",
         "sq",
+        "sq-AL",
         "ar",
         "ar-AA",
         "hy",
@@ -112349,8 +117842,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "da",
         "nl",
         "en-GB",
+        "eo",
         "et",
-        "fil",
         "fi",
         "fr",
         "gl",
@@ -112362,6 +117855,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "it",
         "ja",
         "kn",
+        "km",
+        "km-KH",
         "ko",
         "ko-KR",
         "lv",
@@ -112382,6 +117877,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "sl",
         "es",
         "sv",
+        "tl",
         "ta",
         "te",
         "tr",
@@ -112487,7 +117983,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "delete": {
                 "title": "Delete",
-                "description": "Remove this from the map.",
+                "description": "Delete object permanently.",
                 "annotation": {
                     "point": "Deleted a point.",
                     "vertex": "Deleted a node from a way.",
@@ -112540,7 +118036,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area": "Moved an area.",
                     "multiple": "Moved multiple objects."
                 },
-                "incomplete_relation": "This feature can't be moved because it hasn't been fully downloaded."
+                "incomplete_relation": "This feature can't be moved because it hasn't been fully downloaded.",
+                "too_large": "This can't be moved because not enough of it is currently visible."
             },
             "rotate": {
                 "title": "Rotate",
@@ -112549,7 +118046,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "annotation": {
                     "line": "Rotated a line.",
                     "area": "Rotated an area."
-                }
+                },
+                "too_large": "This can't be rotated because not enough of it is currently visible."
             },
             "reverse": {
                 "title": "Reverse",
@@ -112572,6 +118070,18 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "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": {
@@ -112607,6 +118117,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "upload_explanation_with_user": "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.",
             "save": "Save",
             "cancel": "Cancel",
+            "changes": "{count} Changes",
             "warnings": "Warnings",
             "modified": "Modified",
             "deleted": "Deleted",
@@ -112677,6 +118188,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "help": "Save changes to OpenStreetMap, making them visible to other users.",
             "no_changes": "No changes to save.",
             "error": "An error occurred while trying to save",
+            "unknown_error_details": "Please ensure you are connected to the internet.",
             "uploading": "Uploading changes to OpenStreetMap.",
             "unsaved_changes": "You have unsaved changes"
         },
@@ -112714,7 +118226,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "untagged_area": "Untagged area",
             "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
             "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
-            "untagged_tooltip": "Select a feature type that describes what this {geometry} is.",
+            "untagged_point_tooltip": "Select a feature type that describes what this point is.",
+            "untagged_line_tooltip": "Select a feature type that describes what this line is.",
+            "untagged_area_tooltip": "Select a feature type that describes what this area is.",
             "deprecated_tags": "Deprecated tags: {tags}"
         },
         "zoom": {
@@ -112728,6 +118242,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "zoom": "Zoom to GPX track",
             "browse": "Browse for a .gpx file"
         },
+        "mapillary": {
+            "tooltip": "Street-level photos from Mapillary",
+            "title": "Photo Overlay (Mapillary)",
+            "view_on_mapillary": "View this image on Mapillary"
+        },
         "help": {
             "title": "Help",
             "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
@@ -112763,7 +118282,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "areas": {
                 "title": "Areas",
-                "add": "Areas are a more detailed way to represent features. They provide information on the boundaries of the feature. Areas can be used for most feature types points can be used for, and are often preferred. **Click the Area button to add a new area.**",
+                "add": "Areas are used to show the boundaries of features like lakes, buildings, and residential areas. They can be also be used for more detailed mapping of many features you might normally map as points. **Click the Area button to add a new area.**",
                 "corner": "Areas are drawn by placing nodes that mark the boundary of the area. **Place the starting node on one of the corners of the playground.**",
                 "place": "Draw the area by placing more nodes. Finish the area by clicking on the starting node. **Draw an area for the playground.**",
                 "search": "**Search for '{name}'.**",
@@ -112806,6 +118325,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "category-rail": {
                     "name": "Rail"
                 },
+                "category-restriction": {
+                    "name": "Restriction"
+                },
                 "category-road": {
                     "name": "Road"
                 },
@@ -112858,15 +118380,28 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     }
                 },
                 "access_simple": {
+                    "label": "Access",
+                    "placeholder": "yes"
+                },
+                "access_toilets": {
                     "label": "Access"
                 },
                 "address": {
                     "label": "Address",
                     "placeholders": {
-                        "number": "123",
+                        "housename": "Housename",
+                        "housenumber": "123",
                         "street": "Street",
                         "city": "City",
-                        "postcode": "Postal code"
+                        "postcode": "Postcode",
+                        "place": "Place",
+                        "hamlet": "Hamlet",
+                        "suburb": "Suburb",
+                        "subdistrict": "Subdistrict",
+                        "district": "District",
+                        "province": "Province",
+                        "state": "State",
+                        "country": "Country"
                     }
                 },
                 "admin_level": {
@@ -112876,7 +118411,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Type"
                 },
                 "aerialway/access": {
-                    "label": "Access"
+                    "label": "Access",
+                    "options": {
+                        "entry": "Entry",
+                        "exit": "Exit",
+                        "both": "Both"
+                    }
                 },
                 "aerialway/bubble": {
                     "label": "Bubble"
@@ -112897,7 +118437,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "placeholder": "2, 4, 8..."
                 },
                 "aerialway/summer/access": {
-                    "label": "Access (summer)"
+                    "label": "Access (summer)",
+                    "options": {
+                        "entry": "Entry",
+                        "exit": "Exit",
+                        "both": "Both"
+                    }
                 },
                 "aeroway": {
                     "label": "Type"
@@ -112937,7 +118482,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "placeholder": "50, 100, 200..."
                 },
                 "cardinal_direction": {
-                    "label": "Direction"
+                    "label": "Direction",
+                    "options": {
+                        "N": "North",
+                        "E": "East",
+                        "S": "South",
+                        "W": "West",
+                        "NE": "Northeast",
+                        "SE": "Southeast",
+                        "SW": "Southwest",
+                        "NW": "Northwest",
+                        "NNE": "North-northeast",
+                        "ENE": "East-northeast",
+                        "ESE": "East-southeast",
+                        "SSE": "South-southeast",
+                        "SSW": "South-southwest",
+                        "WSW": "West-southwest",
+                        "WNW": "West-northwest",
+                        "NNW": "North-northwest"
+                    }
                 },
                 "clock_direction": {
                     "label": "Direction",
@@ -112958,6 +118521,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "covered": {
                     "label": "Covered"
                 },
+                "craft": {
+                    "label": "Type"
+                },
                 "crop": {
                     "label": "Crop"
                 },
@@ -112977,7 +118543,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Description"
                 },
                 "electrified": {
-                    "label": "Electrification"
+                    "label": "Electrification",
+                    "placeholder": "Contact Line, Electrified Rail...",
+                    "options": {
+                        "contact_line": "Contact Line",
+                        "rail": "Electrified Rail",
+                        "yes": "Yes (unspecified)",
+                        "no": "No"
+                    }
                 },
                 "elevation": {
                     "label": "Elevation"
@@ -112988,6 +118561,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "entrance": {
                     "label": "Type"
                 },
+                "except": {
+                    "label": "Exceptions"
+                },
                 "fax": {
                     "label": "Fax",
                     "placeholder": "+31 42 123 4567"
@@ -112996,7 +118572,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Fee"
                 },
                 "fire_hydrant/type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "pillar": "Pillar/Aboveground",
+                        "underground": "Underground",
+                        "wall": "Wall",
+                        "pond": "Pond"
+                    }
                 },
                 "fixme": {
                     "label": "Fix Me"
@@ -113004,6 +118586,33 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "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"
                 },
@@ -113056,6 +118665,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "terminal": "Terminal"
                     }
                 },
+                "lamp_type": {
+                    "label": "Type"
+                },
                 "landuse": {
                     "label": "Type"
                 },
@@ -113069,6 +118681,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "leisure": {
                     "label": "Type"
                 },
+                "length": {
+                    "label": "Length (Meters)"
+                },
                 "levels": {
                     "label": "Levels",
                     "placeholder": "2, 4, 6..."
@@ -113086,6 +118701,42 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Speed Limit",
                     "placeholder": "40, 50, 60..."
                 },
+                "mtb/scale": {
+                    "label": "Mountain Biking Difficulty",
+                    "placeholder": "0, 1, 2, 3...",
+                    "options": {
+                        "0": "0: Solid gravel/packed earth, no obstacles, wide curves",
+                        "1": "1: Some loose surface, small obstacles, wide curves",
+                        "2": "2: Much loose surface, large obstacles, easy hairpins",
+                        "3": "3: Slippery surface, large obstacles, tight hairpins",
+                        "4": "4: Loose surface or boulders, dangerous hairpins",
+                        "5": "5: Maximum difficulty, boulder fields, landslides",
+                        "6": "6: Not rideable except by the very best mountain bikers"
+                    }
+                },
+                "mtb/scale/imba": {
+                    "label": "IMBA Trail Difficulty",
+                    "placeholder": "Easy, Medium, Difficult...",
+                    "options": {
+                        "0": "Easiest (white circle)",
+                        "1": "Easy (green circle)",
+                        "2": "Medium (blue square)",
+                        "3": "Difficult (black diamond)",
+                        "4": "Extremely Difficult (double black diamond)"
+                    }
+                },
+                "mtb/scale/uphill": {
+                    "label": "Mountain Biking Uphill Difficulty",
+                    "placeholder": "0, 1, 2, 3...",
+                    "options": {
+                        "0": "0: Avg. incline <10%, gravel/packed earth, no obstacles",
+                        "1": "1: Avg. incline <15%, gravel/packed earth, few small objects",
+                        "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots",
+                        "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches",
+                        "4": "4: Avg. incline <30%, poor condition, big rocks/branches",
+                        "5": "5: Very steep, bike generally needs to be pushed or carried"
+                    }
+                },
                 "name": {
                     "label": "Name",
                     "placeholder": "Common name (if any)"
@@ -113103,10 +118754,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "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"
@@ -113122,24 +118783,65 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Park and Ride"
                 },
                 "parking": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "surface": "Surface",
+                        "multi-storey": "Multilevel",
+                        "underground": "Underground",
+                        "sheds": "Sheds",
+                        "carports": "Carports",
+                        "garage_boxes": "Garage Boxes",
+                        "lane": "Roadside Lane"
+                    }
                 },
                 "phone": {
                     "label": "Phone",
                     "placeholder": "+31 42 123 4567"
                 },
                 "piste/difficulty": {
-                    "label": "Difficulty"
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice (instructional)",
+                        "easy": "Easy (green circle)",
+                        "intermediate": "Intermediate (blue square)",
+                        "advanced": "Advanced (black diamond)",
+                        "expert": "Expert (double black diamond)",
+                        "freeride": "Freeride (off-piste)",
+                        "extreme": "Extreme (climbing equipment required)"
+                    }
                 },
                 "piste/grooming": {
-                    "label": "Grooming"
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic",
+                        "mogul": "Mogul",
+                        "backcountry": "Backcountry",
+                        "classic+skating": "Classic and Skating",
+                        "scooter": "Scooter/Snowmobile",
+                        "skating": "Skating"
+                    }
                 },
                 "piste/type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "downhill": "Downhill",
+                        "nordic": "Nordic",
+                        "skitour": "Skitour",
+                        "sled": "Sled",
+                        "hike": "Hike",
+                        "sleigh": "Sleigh",
+                        "ice_skate": "Ice Skate",
+                        "snow_park": "Snow Park",
+                        "playground": "Playground"
+                    }
                 },
                 "place": {
                     "label": "Type"
                 },
+                "population": {
+                    "label": "Population"
+                },
                 "power": {
                     "label": "Type"
                 },
@@ -113165,20 +118867,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Type"
                 },
                 "religion": {
-                    "label": "Religion",
-                    "options": {
-                        "christian": "Christian",
-                        "muslim": "Muslim",
-                        "buddhist": "Buddhist",
-                        "jewish": "Jewish",
-                        "hindu": "Hindu",
-                        "shinto": "Shinto",
-                        "taoist": "Taoist"
-                    }
+                    "label": "Religion"
                 },
                 "restriction": {
                     "label": "Type"
                 },
+                "restrictions": {
+                    "label": "Turn Restrictions"
+                },
                 "route": {
                     "label": "Type"
                 },
@@ -113186,7 +118882,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Type"
                 },
                 "sac_scale": {
-                    "label": "Path Difficulty"
+                    "label": "Hiking Difficulty",
+                    "placeholder": "Mountain Hiking, Alpine Hiking...",
+                    "options": {
+                        "hiking": "T1: Hiking",
+                        "mountain_hiking": "T2: Mountain Hiking",
+                        "demanding_mountain_hiking": "T3: Demanding Mountain Hiking",
+                        "alpine_hiking": "T4: Alpine Hiking",
+                        "demanding_alpine_hiking": "T5: Demanding Alpine Hiking",
+                        "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"
+                    }
                 },
                 "seasonal": {
                     "label": "Seasonal"
@@ -113203,8 +118908,34 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "shop": {
                     "label": "Type"
                 },
+                "sloped_curb": {
+                    "label": "Sloped Curb"
+                },
                 "smoking": {
-                    "label": "Smoking"
+                    "label": "Smoking",
+                    "placeholder": "No, Separated, Yes...",
+                    "options": {
+                        "no": "No smoking anywhere",
+                        "separated": "In smoking areas, not physically isolated",
+                        "isolated": "In smoking areas, physically isolated",
+                        "outside": "Allowed outside",
+                        "yes": "Allowed everywhere",
+                        "dedicated": "Dedicated to smokers (e.g. smokers' club)"
+                    }
+                },
+                "smoothness": {
+                    "label": "Smoothness",
+                    "placeholder": "Thin Rollers, Wheels, Off-Road...",
+                    "options": {
+                        "excellent": "Thin Rollers: rollerblade, skateboard",
+                        "good": "Thin Wheels: racing bike",
+                        "intermediate": "Wheels: city bike, wheelchair, scooter",
+                        "bad": "Robust Wheels: trekking bike, car, rickshaw",
+                        "very_bad": "High Clearance: light duty off-road vehicle",
+                        "horrible": "Off-Road: heavy duty off-road vehicle",
+                        "very_horrible": "Specialized off-road: tractor, ATV",
+                        "impassible": "Impassible / No wheeled vehicle"
+                    }
                 },
                 "social_facility_for": {
                     "label": "People served",
@@ -113219,6 +118950,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "sport_ice": {
                     "label": "Sport"
                 },
+                "sport_racing": {
+                    "label": "Sport"
+                },
                 "structure": {
                     "label": "Structure",
                     "placeholder": "Unknown",
@@ -113226,7 +118960,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "bridge": "Bridge",
                         "tunnel": "Tunnel",
                         "embankment": "Embankment",
-                        "cutting": "Cutting"
+                        "cutting": "Cutting",
+                        "ford": "Ford"
                     }
                 },
                 "studio_type": {
@@ -113238,8 +118973,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "surface": {
                     "label": "Surface"
                 },
+                "tactile_paving": {
+                    "label": "Tactile Paving"
+                },
                 "toilets/disposal": {
-                    "label": "Disposal"
+                    "label": "Disposal",
+                    "options": {
+                        "flush": "Flush",
+                        "pitlatrine": "Pit/Latrine",
+                        "chemical": "Chemical",
+                        "bucket": "Bucket"
+                    }
                 },
                 "tourism": {
                     "label": "Type"
@@ -113248,10 +118992,27 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Tower type"
                 },
                 "tracktype": {
-                    "label": "Type"
+                    "label": "Track Type",
+                    "placeholder": "Solid, Mostly Solid, Soft...",
+                    "options": {
+                        "grade1": "Solid: paved or heavily compacted hardcore surface",
+                        "grade2": "Mostly Solid: gravel/rock with some soft material mixed in",
+                        "grade3": "Even mixture of hard and soft materials",
+                        "grade4": "Mostly Soft: soil/sand/grass with some hard material mixed in",
+                        "grade5": "Soft: soil/sand/grass"
+                    }
                 },
                 "trail_visibility": {
-                    "label": "Trail Visibility"
+                    "label": "Trail Visibility",
+                    "placeholder": "Excellent, Good, Bad...",
+                    "options": {
+                        "excellent": "Excellent: unambiguous path or markers everywhere",
+                        "good": "Good: markers visible, sometimes require searching",
+                        "intermediate": "Intermediate: few markers, path mostly visible",
+                        "bad": "Bad: no markers, path sometimes invisible/pathless",
+                        "horrible": "Horrible: often pathless, some orientation skills required",
+                        "no": "No: pathless, excellent orientation skills required"
+                    }
                 },
                 "tree_type": {
                     "label": "Type"
@@ -113281,6 +119042,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "wheelchair": {
                     "label": "Wheelchair Access"
                 },
+                "width": {
+                    "label": "Width (Meters)"
+                },
                 "wikipedia": {
                     "label": "Wikipedia"
                 },
@@ -113375,23 +119139,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/arts_centre": {
                     "name": "Arts Center",
-                    "terms": "arts,arts centre"
+                    "terms": ""
                 },
                 "amenity/atm": {
                     "name": "ATM",
-                    "terms": ""
+                    "terms": "money,cash,machine"
                 },
                 "amenity/bank": {
                     "name": "Bank",
-                    "terms": "coffer,countinghouse,credit union,depository,exchequer,fund,hoard,investment firm,repository,reserve,reservoir,safe,savings,stock,stockpile,store,storehouse,thrift,treasury,trust company,vault"
+                    "terms": "credit union,check,deposit,fund,investment,repository,reserve,safe,savings,stock,treasury,trust,vault"
                 },
                 "amenity/bar": {
                     "name": "Bar",
-                    "terms": ""
+                    "terms": "dive,beer,bier,booze"
                 },
                 "amenity/bbq": {
                     "name": "Barbecue/Grill",
-                    "terms": "barbecue,bbq,grill"
+                    "terms": "bbq"
                 },
                 "amenity/bench": {
                     "name": "Bench",
@@ -113399,19 +119163,27 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/bicycle_parking": {
                     "name": "Bicycle Parking",
-                    "terms": ""
+                    "terms": "bike"
                 },
                 "amenity/bicycle_rental": {
                     "name": "Bicycle Rental",
-                    "terms": ""
+                    "terms": "bike"
                 },
                 "amenity/boat_rental": {
                     "name": "Boat Rental",
                     "terms": ""
                 },
+                "amenity/bureau_de_change": {
+                    "name": "Currency Exchange",
+                    "terms": "bureau de change,money changer"
+                },
+                "amenity/bus_station": {
+                    "name": "Bus Station",
+                    "terms": ""
+                },
                 "amenity/cafe": {
                     "name": "Cafe",
-                    "terms": "coffee,tea,coffee shop"
+                    "terms": "coffee,tea"
                 },
                 "amenity/car_rental": {
                     "name": "Car Rental",
@@ -113425,24 +119197,36 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Car Wash",
                     "terms": ""
                 },
+                "amenity/charging_station": {
+                    "name": "Charging Station",
+                    "terms": "EV,Electric Vehicle,Supercharger"
+                },
                 "amenity/childcare": {
-                    "name": "Childcare",
-                    "terms": "nursery,orphanage,playgroup"
+                    "name": "Nursery/Childcare",
+                    "terms": "daycare,orphanage,playgroup"
                 },
                 "amenity/cinema": {
                     "name": "Cinema",
-                    "terms": "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
+                    "terms": "drive-in,film,flick,movie,theater,picture,show,screen"
                 },
                 "amenity/clinic": {
                     "name": "Clinic",
-                    "terms": "clinic,medical clinic"
+                    "terms": "medical,urgentcare"
                 },
                 "amenity/clock": {
                     "name": "Clock",
                     "terms": ""
                 },
                 "amenity/college": {
-                    "name": "College",
+                    "name": "College Grounds",
+                    "terms": "university"
+                },
+                "amenity/community_centre": {
+                    "name": "Community Center",
+                    "terms": "event,hall"
+                },
+                "amenity/compressed_air": {
+                    "name": "Compressed Air",
                     "terms": ""
                 },
                 "amenity/courthouse": {
@@ -113451,15 +119235,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/dentist": {
                     "name": "Dentist",
-                    "terms": "dentist,dentist's office"
+                    "terms": "tooth,teeth"
                 },
                 "amenity/doctor": {
                     "name": "Doctor",
-                    "terms": "doctor,doctor's office"
+                    "terms": "medic*"
+                },
+                "amenity/dojo": {
+                    "name": "Dojo / Martial Arts Academy",
+                    "terms": "martial arts,dojang"
                 },
                 "amenity/drinking_water": {
                     "name": "Drinking Water",
-                    "terms": "water fountain,potable water"
+                    "terms": "fountain,potable"
                 },
                 "amenity/embassy": {
                     "name": "Embassy",
@@ -113467,7 +119255,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/fast_food": {
                     "name": "Fast Food",
-                    "terms": ""
+                    "terms": "restaurant"
                 },
                 "amenity/fire_station": {
                     "name": "Fire Station",
@@ -113487,15 +119275,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/hospital": {
                     "name": "Hospital Grounds",
-                    "terms": "clinic,emergency room,health service,hospice,infirmary,institution,nursing home,rest home,sanatorium,sanitarium,sick bay,surgery,ward"
+                    "terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
                 },
                 "amenity/kindergarten": {
-                    "name": "Kindergarten Grounds",
-                    "terms": "nursery,preschool"
+                    "name": "Preschool/Kindergarten Grounds",
+                    "terms": "kindergarden,pre-school"
                 },
                 "amenity/library": {
                     "name": "Library",
-                    "terms": ""
+                    "terms": "book"
                 },
                 "amenity/marketplace": {
                     "name": "Marketplace",
@@ -113509,9 +119297,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Car Parking",
                     "terms": ""
                 },
+                "amenity/parking_entrance": {
+                    "name": "Parking Garage Entrance/Exit",
+                    "terms": ""
+                },
                 "amenity/pharmacy": {
                     "name": "Pharmacy",
-                    "terms": ""
+                    "terms": "drug,medicine"
                 },
                 "amenity/place_of_worship": {
                     "name": "Place of Worship",
@@ -113523,31 +119315,31 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/place_of_worship/christian": {
                     "name": "Church",
-                    "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
+                    "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
                 },
                 "amenity/place_of_worship/jewish": {
                     "name": "Synagogue",
-                    "terms": "jewish,synagogue"
+                    "terms": "jewish"
                 },
                 "amenity/place_of_worship/muslim": {
                     "name": "Mosque",
-                    "terms": "muslim,mosque"
+                    "terms": "muslim"
                 },
                 "amenity/police": {
                     "name": "Police",
-                    "terms": "badge,bear,blue,bluecoat,bobby,boy scout,bull,constable,constabulary,cop,copper,corps,county mounty,detective,fed,flatfoot,force,fuzz,gendarme,gumshoe,heat,law,law enforcement,man,narc,officers,patrolman,police"
+                    "terms": "badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol"
                 },
                 "amenity/post_box": {
                     "name": "Mailbox",
-                    "terms": "letter drop,letterbox,mail drop,mailbox,pillar box,postbox"
+                    "terms": "letter,post"
                 },
                 "amenity/post_office": {
                     "name": "Post Office",
-                    "terms": ""
+                    "terms": "letter,mail"
                 },
                 "amenity/pub": {
                     "name": "Pub",
-                    "terms": ""
+                    "terms": "dive,beer,bier,booze"
                 },
                 "amenity/ranger_station": {
                     "name": "Ranger Station",
@@ -113555,19 +119347,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/recycling": {
                     "name": "Recycling",
-                    "terms": ""
+                    "terms": "can,bottle,garbage,scrap,trash"
                 },
                 "amenity/restaurant": {
                     "name": "Restaurant",
-                    "terms": "bar,cafeteria,café,canteen,chophouse,coffee shop,diner,dining room,dive*,doughtnut shop,drive-in,eatery,eating house,eating place,fast-food place,fish and chips,greasy spoon,grill,hamburger stand,hashery,hideaway,hotdog stand,inn,joint*,luncheonette,lunchroom,night club,outlet*,pizzeria,saloon,soda fountain,watering hole"
+                    "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
                 },
                 "amenity/school": {
                     "name": "School Grounds",
-                    "terms": "academy,alma mater,blackboard,college,department,discipline,establishment,faculty,hall,halls of ivy,institute,institution,jail*,schoolhouse,seminary,university"
+                    "terms": "academy,elementary school,middle school,high school"
                 },
                 "amenity/shelter": {
                     "name": "Shelter",
-                    "terms": "lean-to"
+                    "terms": "lean-to,gazebo,picnic"
                 },
                 "amenity/social_facility": {
                     "name": "Social Facility",
@@ -113578,8 +119370,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "amenity/social_facility/group_home": {
-                    "name": "Group Home",
-                    "terms": "elderly,old,senior living"
+                    "name": "Elderly Group Home",
+                    "terms": "old,senior,living"
                 },
                 "amenity/social_facility/homeless_shelter": {
                     "name": "Homeless Shelter",
@@ -113587,7 +119379,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/studio": {
                     "name": "Studio",
-                    "terms": "recording studio,studio,radio,radio studio,television,television studio"
+                    "terms": "recording,radio,television"
                 },
                 "amenity/swimming_pool": {
                     "name": "Swimming Pool",
@@ -113611,15 +119403,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/townhall": {
                     "name": "Town Hall",
-                    "terms": "village hall,city government,courthouse,municipal building,municipal center,municipal centre"
+                    "terms": "village,city,government,courthouse,municipal"
                 },
                 "amenity/university": {
-                    "name": "University",
+                    "name": "University Grounds",
                     "terms": "college"
                 },
                 "amenity/vending_machine": {
                     "name": "Vending Machine",
-                    "terms": ""
+                    "terms": "snack,soda,ticket"
                 },
                 "amenity/veterinary": {
                     "name": "Veterinary",
@@ -113627,7 +119419,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/waste_basket": {
                     "name": "Waste Basket",
-                    "terms": "rubbish bin,litter bin,trash can,garbage can"
+                    "terms": "rubbish,litter,trash,garbage"
                 },
                 "area": {
                     "name": "Area",
@@ -113737,6 +119529,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Church",
                     "terms": ""
                 },
+                "building/college": {
+                    "name": "College Building",
+                    "terms": "university"
+                },
                 "building/commercial": {
                     "name": "Commercial Building",
                     "terms": ""
@@ -113754,7 +119550,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "building/entrance": {
-                    "name": "Entrance",
+                    "name": "Entrance/Exit",
                     "terms": ""
                 },
                 "building/garage": {
@@ -113789,6 +119585,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Industrial Building",
                     "terms": ""
                 },
+                "building/kindergarten": {
+                    "name": "Preschool/Kindergarten Building",
+                    "terms": "kindergarden,pre-school"
+                },
                 "building/public": {
                     "name": "Public Building",
                     "terms": ""
@@ -113807,7 +119607,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "building/school": {
                     "name": "School Building",
-                    "terms": ""
+                    "terms": "academy,elementary school,middle school,high school"
                 },
                 "building/shed": {
                     "name": "Shed",
@@ -113831,191 +119631,199 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "building/university": {
                     "name": "University Building",
-                    "terms": ""
+                    "terms": "college"
                 },
                 "building/warehouse": {
                     "name": "Warehouse",
                     "terms": ""
                 },
+                "craft": {
+                    "name": "Craft",
+                    "terms": ""
+                },
                 "craft/basket_maker": {
                     "name": "Basket Maker",
-                    "terms": "basket,basketry,basket maker,basket weaver"
+                    "terms": ""
                 },
                 "craft/beekeeper": {
                     "name": "Beekeeper",
-                    "terms": "bees,beekeeper,bee box"
+                    "terms": ""
                 },
                 "craft/blacksmith": {
                     "name": "Blacksmith",
-                    "terms": "blacksmith"
+                    "terms": ""
                 },
                 "craft/boatbuilder": {
                     "name": "Boat Builder",
-                    "terms": "boat builder"
+                    "terms": ""
                 },
                 "craft/bookbinder": {
                     "name": "Bookbinder",
-                    "terms": "bookbinder,book repair"
+                    "terms": "book repair"
                 },
                 "craft/brewery": {
                     "name": "Brewery",
-                    "terms": "brewery"
+                    "terms": "beer,bier"
                 },
                 "craft/carpenter": {
                     "name": "Carpenter",
-                    "terms": "carpenter,woodworker"
+                    "terms": "woodworker"
                 },
                 "craft/carpet_layer": {
                     "name": "Carpet Layer",
-                    "terms": "carpet layer"
+                    "terms": ""
                 },
                 "craft/caterer": {
                     "name": "Caterer",
-                    "terms": "Caterer,Catering"
+                    "terms": ""
                 },
                 "craft/clockmaker": {
                     "name": "Clockmaker",
-                    "terms": "clock,clockmaker,clock repair"
+                    "terms": ""
                 },
                 "craft/confectionary": {
                     "name": "Confectionary",
-                    "terms": "confectionary,sweets,candy"
+                    "terms": "sweets,candy"
                 },
                 "craft/dressmaker": {
                     "name": "Dressmaker",
-                    "terms": "dress,dressmaker"
+                    "terms": "seamstress"
                 },
                 "craft/electrician": {
                     "name": "Electrician",
-                    "terms": "electrician"
+                    "terms": "power,wire"
                 },
                 "craft/gardener": {
                     "name": "Gardener",
-                    "terms": "gardener,landscaper,grounds keeper"
+                    "terms": "landscaper,grounds keeper"
                 },
                 "craft/glaziery": {
                     "name": "Glaziery",
-                    "terms": "glass,glass foundry,stained-glass,window"
+                    "terms": "glass,stained-glass,window"
                 },
                 "craft/handicraft": {
                     "name": "Handicraft",
-                    "terms": "handicraft"
+                    "terms": ""
                 },
                 "craft/hvac": {
                     "name": "HVAC",
-                    "terms": "heating,ventilating,air-conditioning,air conditioning"
+                    "terms": "heat*,vent*,air conditioning"
                 },
                 "craft/insulator": {
                     "name": "Insulator",
-                    "terms": "insulation,insulator"
+                    "terms": ""
                 },
                 "craft/jeweler": {
                     "name": "Jeweler",
-                    "terms": "jeweler,gem,diamond"
+                    "terms": ""
                 },
                 "craft/key_cutter": {
                     "name": "Key Cutter",
-                    "terms": "key,key cutter"
+                    "terms": ""
                 },
                 "craft/locksmith": {
                     "name": "Locksmith",
-                    "terms": "locksmith,lock"
+                    "terms": ""
                 },
                 "craft/metal_construction": {
                     "name": "Metal Construction",
-                    "terms": "metal construction"
+                    "terms": ""
                 },
                 "craft/optician": {
                     "name": "Optician",
-                    "terms": "glasses,optician"
+                    "terms": ""
                 },
                 "craft/painter": {
                     "name": "Painter",
-                    "terms": "painter"
+                    "terms": ""
                 },
                 "craft/photographer": {
                     "name": "Photographer",
-                    "terms": "photographer"
+                    "terms": ""
                 },
                 "craft/photographic_laboratory": {
                     "name": "Photographic Laboratory",
-                    "terms": "photographic laboratory,film developer"
+                    "terms": "film"
                 },
                 "craft/plasterer": {
                     "name": "Plasterer",
-                    "terms": "plasterer"
+                    "terms": ""
                 },
                 "craft/plumber": {
                     "name": "Plumber",
-                    "terms": "pumber"
+                    "terms": "pipe"
                 },
                 "craft/pottery": {
                     "name": "Pottery",
-                    "terms": "pottery,potter"
+                    "terms": "ceramic"
                 },
                 "craft/rigger": {
                     "name": "Rigger",
-                    "terms": "rigger"
+                    "terms": ""
                 },
                 "craft/roofer": {
                     "name": "Roofer",
-                    "terms": "roofer"
+                    "terms": ""
                 },
                 "craft/saddler": {
                     "name": "Saddler",
-                    "terms": "saddler"
+                    "terms": ""
                 },
                 "craft/sailmaker": {
                     "name": "Sailmaker",
-                    "terms": "sailmaker"
+                    "terms": ""
                 },
                 "craft/sawmill": {
                     "name": "Sawmill",
-                    "terms": "sawmill,lumber"
+                    "terms": "lumber"
                 },
                 "craft/scaffolder": {
                     "name": "Scaffolder",
-                    "terms": "scaffolder"
+                    "terms": ""
                 },
                 "craft/sculpter": {
                     "name": "Sculpter",
-                    "terms": "sculpter"
+                    "terms": ""
                 },
                 "craft/shoemaker": {
                     "name": "Shoemaker",
-                    "terms": "shoe repair,shoemaker"
+                    "terms": "cobbler"
                 },
                 "craft/stonemason": {
                     "name": "Stonemason",
-                    "terms": "stonemason,masonry"
+                    "terms": "masonry"
                 },
                 "craft/sweep": {
                     "name": "Chimney Sweep",
-                    "terms": "sweep,chimney sweep"
+                    "terms": ""
                 },
                 "craft/tailor": {
                     "name": "Tailor",
-                    "terms": "tailor,clothes"
+                    "terms": "clothes,suit"
                 },
                 "craft/tiler": {
                     "name": "Tiler",
-                    "terms": "tiler"
+                    "terms": ""
                 },
                 "craft/tinsmith": {
                     "name": "Tinsmith",
-                    "terms": "tinsmith"
+                    "terms": ""
                 },
                 "craft/upholsterer": {
                     "name": "Upholsterer",
-                    "terms": "upholsterer"
+                    "terms": ""
                 },
                 "craft/watchmaker": {
                     "name": "Watchmaker",
-                    "terms": "watch,watchmaker,watch repair"
+                    "terms": ""
                 },
                 "craft/window_construction": {
                     "name": "Window Construction",
-                    "terms": "window,window maker,window construction"
+                    "terms": "glass"
+                },
+                "craft/winery": {
+                    "name": "Winery",
+                    "terms": ""
                 },
                 "embankment": {
                     "name": "Embankment",
@@ -114023,7 +119831,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "emergency/ambulance_station": {
                     "name": "Ambulance Station",
-                    "terms": ""
+                    "terms": "EMS,EMT,rescue"
                 },
                 "emergency/fire_hydrant": {
                     "name": "Fire Hydrant",
@@ -114034,17 +119842,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "entrance": {
-                    "name": "Entrance",
+                    "name": "Entrance/Exit",
                     "terms": ""
                 },
                 "footway/crossing": {
                     "name": "Crossing",
-                    "terms": "crosswalk,zebra crossing"
+                    "terms": ""
+                },
+                "footway/crosswalk": {
+                    "name": "Crosswalk",
+                    "terms": "zebra crossing"
                 },
                 "footway/sidewalk": {
                     "name": "Sidewalk",
                     "terms": ""
                 },
+                "ford": {
+                    "name": "Ford",
+                    "terms": ""
+                },
                 "golf/bunker": {
                     "name": "Sand Trap",
                     "terms": "hazard,bunker"
@@ -114055,7 +119871,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "golf/green": {
                     "name": "Putting Green",
-                    "terms": "putting green"
+                    "terms": ""
                 },
                 "golf/hole": {
                     "name": "Golf Hole",
@@ -114083,7 +119899,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "highway/bridleway": {
                     "name": "Bridle Path",
-                    "terms": "bridleway,equestrian trail,horse riding path,bridle road,horse trail"
+                    "terms": "bridleway,equestrian,horse"
                 },
                 "highway/bus_stop": {
                     "name": "Bus Stop",
@@ -114091,15 +119907,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "highway/crossing": {
                     "name": "Crossing",
-                    "terms": "crosswalk,zebra crossing"
+                    "terms": ""
+                },
+                "highway/crosswalk": {
+                    "name": "Crosswalk",
+                    "terms": "zebra crossing"
                 },
                 "highway/cycleway": {
                     "name": "Cycle Path",
-                    "terms": ""
+                    "terms": "bike"
                 },
                 "highway/footway": {
                     "name": "Foot Path",
-                    "terms": "beaten path,boulevard,clearing,course,cut*,drag*,footpath,highway,lane,line,orbit,passage,pathway,rail,rails,road,roadway,route,street,thoroughfare,trackway,trail,trajectory,walk"
+                    "terms": "hike,hiking,trackway,trail,walk"
                 },
                 "highway/living_street": {
                     "name": "Living Street",
@@ -114114,7 +119934,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "highway/motorway_junction": {
-                    "name": "Motorway Junction",
+                    "name": "Motorway Junction / Exit",
                     "terms": ""
                 },
                 "highway/motorway_link": {
@@ -114123,7 +119943,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "highway/path": {
                     "name": "Path",
-                    "terms": ""
+                    "terms": "hike,hiking,trackway,trail,walk"
                 },
                 "highway/pedestrian": {
                     "name": "Pedestrian",
@@ -114137,13 +119957,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Primary Link",
                     "terms": "ramp,on ramp,off ramp"
                 },
+                "highway/raceway": {
+                    "name": "Motor Raceway",
+                    "terms": "auto*,race*,nascar"
+                },
                 "highway/residential": {
                     "name": "Residential Road",
                     "terms": ""
                 },
                 "highway/rest_area": {
                     "name": "Rest Area",
-                    "terms": "rest stop,turnout,lay-by"
+                    "terms": "rest stop"
                 },
                 "highway/road": {
                     "name": "Unknown Road",
@@ -114193,6 +120017,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Stop Sign",
                     "terms": "stop sign"
                 },
+                "highway/street_lamp": {
+                    "name": "Street Lamp",
+                    "terms": "streetlight,street light,lamp,light,gaslight"
+                },
                 "highway/tertiary": {
                     "name": "Tertiary Road",
                     "terms": ""
@@ -114203,7 +120031,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "highway/track": {
                     "name": "Track",
-                    "terms": ""
+                    "terms": "woods road,fire road"
                 },
                 "highway/traffic_signals": {
                     "name": "Traffic Signals",
@@ -114219,7 +120047,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "highway/turning_circle": {
                     "name": "Turning Circle",
-                    "terms": ""
+                    "terms": "cul-de-sac"
                 },
                 "highway/unclassified": {
                     "name": "Unclassified Road",
@@ -114277,6 +120105,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Cemetery",
                     "terms": ""
                 },
+                "landuse/churchyard": {
+                    "name": "Churchyard",
+                    "terms": ""
+                },
                 "landuse/commercial": {
                     "name": "Commercial",
                     "terms": ""
@@ -114317,6 +120149,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Meadow",
                     "terms": ""
                 },
+                "landuse/military": {
+                    "name": "Military",
+                    "terms": ""
+                },
                 "landuse/orchard": {
                     "name": "Orchard",
                     "terms": ""
@@ -114367,7 +120203,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "leisure/marina": {
                     "name": "Marina",
-                    "terms": ""
+                    "terms": "boat"
                 },
                 "leisure/park": {
                     "name": "Park",
@@ -114375,11 +120211,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "leisure/picnic_table": {
                     "name": "Picnic Table",
-                    "terms": "bench,table"
+                    "terms": "bench"
                 },
                 "leisure/pitch": {
                     "name": "Sport Pitch",
-                    "terms": ""
+                    "terms": "field"
                 },
                 "leisure/pitch/american_football": {
                     "name": "American Football Field",
@@ -114413,12 +120249,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Playground",
                     "terms": "jungle gym,play area"
                 },
+                "leisure/running_track": {
+                    "name": "Running Track",
+                    "terms": ""
+                },
                 "leisure/slipway": {
                     "name": "Slipway",
-                    "terms": ""
+                    "terms": "boat launch,boat ramp"
                 },
                 "leisure/sports_center": {
-                    "name": "Sports Center",
+                    "name": "Sports Center / Gym",
                     "terms": "gym"
                 },
                 "leisure/stadium": {
@@ -114430,7 +120270,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "leisure/track": {
-                    "name": "Race Track",
+                    "name": "Racetrack (non-Motorsport)",
                     "terms": ""
                 },
                 "line": {
@@ -114483,14 +120323,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "man_made/wastewater_plant": {
                     "name": "Wastewater Plant",
-                    "terms": "sewage works,sewage treatment plant,water treatment plant,reclamation plant"
+                    "terms": "sewage*,water treatment plant,reclamation plant"
                 },
                 "man_made/water_tower": {
                     "name": "Water Tower",
                     "terms": ""
                 },
                 "man_made/water_well": {
-                    "name": "Water well",
+                    "name": "Water Well",
                     "terms": ""
                 },
                 "man_made/water_works": {
@@ -114619,7 +120459,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "office/employment_agency": {
                     "name": "Employment Agency",
-                    "terms": ""
+                    "terms": "job"
                 },
                 "office/estate_agent": {
                     "name": "Real Estate Office",
@@ -114749,6 +120589,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Substation",
                     "terms": ""
                 },
+                "power/substation": {
+                    "name": "Substation",
+                    "terms": ""
+                },
                 "power/tower": {
                     "name": "High-Voltage Tower",
                     "terms": ""
@@ -114835,20 +120679,44 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "shop/alcohol": {
                     "name": "Liquor Store",
-                    "terms": "alcohol"
+                    "terms": "alcohol,beer,booze,wine"
+                },
+                "shop/anime": {
+                    "name": "Anime Shop",
+                    "terms": ""
+                },
+                "shop/antiques": {
+                    "name": "Antiques Shop",
+                    "terms": ""
                 },
                 "shop/art": {
-                    "name": "Art Shop",
-                    "terms": "art store,art gallery"
+                    "name": "Art Gallery",
+                    "terms": ""
+                },
+                "shop/baby_goods": {
+                    "name": "Baby Goods Store",
+                    "terms": ""
+                },
+                "shop/bag": {
+                    "name": "Bag/Luggage Store",
+                    "terms": "handbag,purse"
                 },
                 "shop/bakery": {
                     "name": "Bakery",
                     "terms": ""
                 },
+                "shop/bathroom_furnishing": {
+                    "name": "Bathroom Furnishing Store",
+                    "terms": ""
+                },
                 "shop/beauty": {
                     "name": "Beauty Shop",
                     "terms": "nail spa,spa,salon,tanning"
                 },
+                "shop/bed": {
+                    "name": "Bedding/Mattress Store",
+                    "terms": ""
+                },
                 "shop/beverages": {
                     "name": "Beverage Store",
                     "terms": ""
@@ -114862,7 +120730,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "shop/books": {
-                    "name": "Bookstore",
+                    "name": "Book Store",
                     "terms": ""
                 },
                 "shop/boutique": {
@@ -114871,24 +120739,40 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "shop/butcher": {
                     "name": "Butcher",
+                    "terms": "meat"
+                },
+                "shop/candles": {
+                    "name": "Candle Shop",
                     "terms": ""
                 },
                 "shop/car": {
                     "name": "Car Dealership",
-                    "terms": ""
+                    "terms": "auto"
                 },
                 "shop/car_parts": {
                     "name": "Car Parts Store",
-                    "terms": ""
+                    "terms": "auto"
                 },
                 "shop/car_repair": {
                     "name": "Car Repair Shop",
+                    "terms": "auto"
+                },
+                "shop/carpet": {
+                    "name": "Carpet Store",
+                    "terms": "rug"
+                },
+                "shop/cheese": {
+                    "name": "Cheese Store",
                     "terms": ""
                 },
                 "shop/chemist": {
                     "name": "Chemist",
                     "terms": ""
                 },
+                "shop/chocolate": {
+                    "name": "Chocolate Store",
+                    "terms": ""
+                },
                 "shop/clothes": {
                     "name": "Clothing Store",
                     "terms": ""
@@ -114898,16 +120782,36 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "shop/confectionery": {
-                    "name": "Confectionery",
+                    "name": "Candy Store",
                     "terms": ""
                 },
                 "shop/convenience": {
                     "name": "Convenience Store",
                     "terms": ""
                 },
+                "shop/copyshop": {
+                    "name": "Copy Store",
+                    "terms": ""
+                },
+                "shop/cosmetics": {
+                    "name": "Cosmetics Store",
+                    "terms": ""
+                },
+                "shop/craft": {
+                    "name": "Arts and Crafts Store",
+                    "terms": ""
+                },
+                "shop/curtain": {
+                    "name": "Curtain Store",
+                    "terms": "drape*,window"
+                },
+                "shop/dairy": {
+                    "name": "Dairy Store",
+                    "terms": "milk,egg,cheese"
+                },
                 "shop/deli": {
                     "name": "Deli",
-                    "terms": ""
+                    "terms": "lunch,meat,sandwich"
                 },
                 "shop/department_store": {
                     "name": "Department Store",
@@ -114918,36 +120822,56 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "shop/dry_cleaning": {
-                    "name": "Dry Cleaners",
+                    "name": "Dry Cleaner",
                     "terms": ""
                 },
                 "shop/electronics": {
                     "name": "Electronics Store",
-                    "terms": ""
+                    "terms": "appliance,audio,computer,tv"
+                },
+                "shop/erotic": {
+                    "name": "Erotic Store",
+                    "terms": "sex,porn"
+                },
+                "shop/fabric": {
+                    "name": "Fabric Store",
+                    "terms": "sew"
                 },
                 "shop/farm": {
                     "name": "Produce Stand",
                     "terms": "farm shop,farm stand"
                 },
+                "shop/fashion": {
+                    "name": "Fashion Store",
+                    "terms": ""
+                },
                 "shop/fishmonger": {
                     "name": "Fishmonger",
                     "terms": ""
                 },
                 "shop/florist": {
                     "name": "Florist",
+                    "terms": "flower"
+                },
+                "shop/frame": {
+                    "name": "Framing Shop",
                     "terms": ""
                 },
                 "shop/funeral_directors": {
                     "name": "Funeral Home",
-                    "terms": "undertaker,funeral parlour,funeral parlor,memorial home"
+                    "terms": "undertaker,memorial home"
+                },
+                "shop/furnace": {
+                    "name": "Furnace Store",
+                    "terms": "oven,stove"
                 },
                 "shop/furniture": {
                     "name": "Furniture Store",
-                    "terms": ""
+                    "terms": "chair,sofa,table"
                 },
                 "shop/garden_centre": {
                     "name": "Garden Center",
-                    "terms": "garden centre"
+                    "terms": "landscape,mulch,shrub,tree"
                 },
                 "shop/gift": {
                     "name": "Gift Shop",
@@ -114955,7 +120879,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "shop/greengrocer": {
                     "name": "Greengrocer",
-                    "terms": ""
+                    "terms": "fruit,vegetable"
                 },
                 "shop/hairdresser": {
                     "name": "Hairdresser",
@@ -114965,25 +120889,45 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Hardware Store",
                     "terms": ""
                 },
+                "shop/hearing_aids": {
+                    "name": "Hearing Aids Store",
+                    "terms": ""
+                },
+                "shop/herbalist": {
+                    "name": "Herbalist",
+                    "terms": ""
+                },
                 "shop/hifi": {
                     "name": "Hifi Store",
+                    "terms": "stereo,video"
+                },
+                "shop/interior_decoration": {
+                    "name": "Interior Decoration Store",
                     "terms": ""
                 },
                 "shop/jewelry": {
                     "name": "Jeweler",
-                    "terms": ""
+                    "terms": "diamond,gem,ring"
                 },
                 "shop/kiosk": {
-                    "name": "Kiosk",
+                    "name": "News Kiosk",
+                    "terms": ""
+                },
+                "shop/kitchen": {
+                    "name": "Kitchen Design Store",
                     "terms": ""
                 },
                 "shop/laundry": {
                     "name": "Laundry",
                     "terms": ""
                 },
+                "shop/leather": {
+                    "name": "Leather Store",
+                    "terms": ""
+                },
                 "shop/locksmith": {
                     "name": "Locksmith",
-                    "terms": "keys"
+                    "terms": "key,lockpick"
                 },
                 "shop/lottery": {
                     "name": "Lottery Shop",
@@ -114993,42 +120937,90 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Mall",
                     "terms": ""
                 },
+                "shop/massage": {
+                    "name": "Massage Shop",
+                    "terms": ""
+                },
+                "shop/medical_supply": {
+                    "name": "Medical Supply Store",
+                    "terms": ""
+                },
                 "shop/mobile_phone": {
                     "name": "Mobile Phone Store",
                     "terms": ""
                 },
+                "shop/money_lender": {
+                    "name": "Money Lender",
+                    "terms": ""
+                },
                 "shop/motorcycle": {
                     "name": "Motorcycle Dealership",
                     "terms": ""
                 },
                 "shop/music": {
                     "name": "Music Store",
+                    "terms": "CD,vinyl"
+                },
+                "shop/musical_instrument": {
+                    "name": "Musical Instrument Store",
                     "terms": ""
                 },
                 "shop/newsagent": {
-                    "name": "Newsagent",
+                    "name": "Newspaper/Magazine Shop",
                     "terms": ""
                 },
                 "shop/optician": {
                     "name": "Optician",
+                    "terms": "eye,glasses"
+                },
+                "shop/organic": {
+                    "name": "Organic Goods Store",
                     "terms": ""
                 },
                 "shop/outdoor": {
-                    "name": "Outdoor Store",
+                    "name": "Outdoors Store",
+                    "terms": "camping,climbing,hiking"
+                },
+                "shop/paint": {
+                    "name": "Paint Store",
+                    "terms": ""
+                },
+                "shop/pawnbroker": {
+                    "name": "Pawn Shop",
                     "terms": ""
                 },
                 "shop/pet": {
                     "name": "Pet Store",
-                    "terms": ""
+                    "terms": "cat,dog,fish"
                 },
                 "shop/photo": {
                     "name": "Photography Store",
+                    "terms": "camera,film"
+                },
+                "shop/pyrotechnics": {
+                    "name": "Fireworks Store",
+                    "terms": ""
+                },
+                "shop/radiotechnics": {
+                    "name": "Radio/Electronic Component Store",
+                    "terms": ""
+                },
+                "shop/religion": {
+                    "name": "Religious Store",
+                    "terms": ""
+                },
+                "shop/scuba_diving": {
+                    "name": "Scuba Diving Shop",
                     "terms": ""
                 },
                 "shop/seafood": {
                     "name": "Seafood Shop",
                     "terms": "fishmonger"
                 },
+                "shop/second_hand": {
+                    "name": "Consignment/Thrift Store",
+                    "terms": "secondhand,second hand,resale,thrift,used"
+                },
                 "shop/shoes": {
                     "name": "Shoe Store",
                     "terms": ""
@@ -115039,11 +121031,31 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "shop/stationery": {
                     "name": "Stationery Store",
-                    "terms": ""
+                    "terms": "card,paper"
                 },
                 "shop/supermarket": {
                     "name": "Supermarket",
-                    "terms": "bazaar,boutique,chain,co-op,cut-rate store,discount store,five-and-dime,flea market,galleria,grocery store,mall,mart,outlet,outlet store,shop,shopping center,shopping centre,shopping plaza,stand,store,supermarket,thrift shop"
+                    "terms": "grocery,store,shop"
+                },
+                "shop/tailor": {
+                    "name": "Tailor",
+                    "terms": "clothes,suit"
+                },
+                "shop/tattoo": {
+                    "name": "Tattoo Parlor",
+                    "terms": ""
+                },
+                "shop/tea": {
+                    "name": "Tea Store",
+                    "terms": ""
+                },
+                "shop/ticket": {
+                    "name": "Ticket Seller",
+                    "terms": ""
+                },
+                "shop/tobacco": {
+                    "name": "Tobacco Shop",
+                    "terms": ""
                 },
                 "shop/toys": {
                     "name": "Toy Store",
@@ -115061,12 +121073,36 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Vacant Shop",
                     "terms": ""
                 },
+                "shop/vacuum_cleaner": {
+                    "name": "Vacuum Cleaner Store",
+                    "terms": ""
+                },
                 "shop/variety_store": {
                     "name": "Variety Store",
                     "terms": ""
                 },
                 "shop/video": {
                     "name": "Video Store",
+                    "terms": "DVD"
+                },
+                "shop/video_games": {
+                    "name": "Video Game Store",
+                    "terms": ""
+                },
+                "shop/water_sports": {
+                    "name": "Watersport/Swim Shop",
+                    "terms": ""
+                },
+                "shop/weapons": {
+                    "name": "Weapon Shop",
+                    "terms": "ammo,gun,knife,knives"
+                },
+                "shop/window_blind": {
+                    "name": "Window Blind Store",
+                    "terms": ""
+                },
+                "shop/wine": {
+                    "name": "Wine Shop",
                     "terms": ""
                 },
                 "tourism": {
@@ -115087,7 +121123,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "tourism/camp_site": {
                     "name": "Camp Site",
-                    "terms": "camping"
+                    "terms": ""
                 },
                 "tourism/caravan_site": {
                     "name": "RV Park",
@@ -115099,7 +121135,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "tourism/guest_house": {
                     "name": "Guest House",
-                    "terms": "B&B,Bed & Breakfast,Bed and Breakfast"
+                    "terms": "B&B,Bed and Breakfast"
                 },
                 "tourism/hostel": {
                     "name": "Hostel",
@@ -115119,11 +121155,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "tourism/museum": {
                     "name": "Museum",
-                    "terms": "exhibition,exhibits archive,foundation,gallery,hall,institution,library,menagerie,repository,salon,storehouse,treasury,vault"
+                    "terms": "exhibition,foundation,gallery,hall,institution"
                 },
                 "tourism/picnic_site": {
                     "name": "Picnic Site",
-                    "terms": ""
+                    "terms": "camp"
                 },
                 "tourism/theme_park": {
                     "name": "Theme Park",
@@ -115137,6 +121173,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Zoo",
                     "terms": ""
                 },
+                "traffic_calming/bump": {
+                    "name": "Speed Bump",
+                    "terms": "speed hump"
+                },
+                "traffic_calming/hump": {
+                    "name": "Speed Hump",
+                    "terms": "speed bump"
+                },
+                "traffic_calming/rumble_strip": {
+                    "name": "Rumble Strip",
+                    "terms": "sleeper lines,audible lines,growlers"
+                },
+                "traffic_calming/table": {
+                    "name": "Raised Pedestrian Crossing",
+                    "terms": "speed table,flat top hump"
+                },
                 "type/boundary": {
                     "name": "Boundary",
                     "terms": ""
@@ -115153,6 +121205,34 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "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": ""
@@ -120083,5 +126163,183 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 }
             }
         }
-    }
+    },
+    "addressFormats": [
+        {
+            "format": [
+                [
+                    "housenumber",
+                    "street"
+                ],
+                [
+                    "city",
+                    "postcode"
+                ]
+            ]
+        },
+        {
+            "countryCodes": [
+                "gb"
+            ],
+            "format": [
+                [
+                    "housename"
+                ],
+                [
+                    "housenumber",
+                    "street"
+                ],
+                [
+                    "city",
+                    "postcode"
+                ]
+            ]
+        },
+        {
+            "countryCodes": [
+                "ie"
+            ],
+            "format": [
+                [
+                    "housename"
+                ],
+                [
+                    "housenumber",
+                    "street"
+                ],
+                [
+                    "city"
+                ]
+            ]
+        },
+        {
+            "countryCodes": [
+                "ad",
+                "at",
+                "ba",
+                "be",
+                "ch",
+                "cz",
+                "de",
+                "dk",
+                "es",
+                "fi",
+                "gr",
+                "hr",
+                "is",
+                "it",
+                "li",
+                "nl",
+                "no",
+                "pl",
+                "pt",
+                "se",
+                "si",
+                "sk",
+                "sm",
+                "va"
+            ],
+            "format": [
+                [
+                    "street",
+                    "housenumber"
+                ],
+                [
+                    "postcode",
+                    "city"
+                ]
+            ]
+        },
+        {
+            "countryCodes": [
+                "fr",
+                "lu",
+                "mo"
+            ],
+            "format": [
+                [
+                    "housenumber",
+                    "street"
+                ],
+                [
+                    "postcode",
+                    "city"
+                ]
+            ]
+        },
+        {
+            "countryCodes": [
+                "br"
+            ],
+            "format": [
+                [
+                    "street"
+                ],
+                [
+                    "housenumber",
+                    "suburb"
+                ],
+                [
+                    "city",
+                    "postcode"
+                ]
+            ]
+        },
+        {
+            "countryCodes": [
+                "vn"
+            ],
+            "format": [
+                [
+                    "housenumber",
+                    "street"
+                ],
+                [
+                    "subdistrict"
+                ],
+                [
+                    "district"
+                ],
+                [
+                    "city"
+                ],
+                [
+                    "province",
+                    "postcode"
+                ]
+            ]
+        },
+        {
+            "countryCodes": [
+                "us"
+            ],
+            "format": [
+                [
+                    "housenumber",
+                    "street"
+                ],
+                [
+                    "city",
+                    "state",
+                    "postcode"
+                ]
+            ]
+        },
+        {
+            "countryCodes": [
+                "ca"
+            ],
+            "format": [
+                [
+                    "housenumber",
+                    "street"
+                ],
+                [
+                    "city",
+                    "province",
+                    "postcode"
+                ]
+            ]
+        }
+    ]
 };
\ No newline at end of file