X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f5f71dd42c949a655f736e80de11ca51b940fcef..e3b0b7813c31e92d86ebe61deddfc735cba056b7:/vendor/assets/iD/iD.js

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index 6ce81633a..e38326bb7 100644
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -6557,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 ,
@@ -16422,7 +16428,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.6.0';
+iD.version = '1.6.2';
 
 (function() {
     var detected = {};
@@ -16734,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]));
@@ -17141,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) {
@@ -17152,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]));
     },
@@ -19412,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);
         }
 
@@ -19436,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;
         }
@@ -20855,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);
@@ -23108,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;
         });
     },
 
@@ -23353,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);
         });
@@ -23376,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;
     };
@@ -23395,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;
 
@@ -23406,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) {
@@ -23441,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;
         });
     },
 
@@ -23645,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);
             }
@@ -24478,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) {
@@ -27154,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);
@@ -27246,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')
@@ -27266,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')
@@ -29584,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;
             }
@@ -29885,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);
@@ -30634,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);
@@ -30848,6 +30870,7 @@ iD.ui.preset.address = function(field, context) {
         housenumber: 1/3,
         street: 2/3,
         city: 2/3,
+        state: 1/4,
         postcode: 1/3
     };
 
@@ -43031,668 +43054,2508 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "polygon": [
                 [
                     [
-                        -119.5867318,
-                        49.7928087
+                        -119.5867318,
+                        49.7928087
+                    ],
+                    [
+                        -119.5465655,
+                        49.7928097
+                    ],
+                    [
+                        -119.5465661,
+                        49.8013837
+                    ],
+                    [
+                        -119.5343374,
+                        49.8013841
+                    ],
+                    [
+                        -119.5343376,
+                        49.8047321
+                    ],
+                    [
+                        -119.5296211,
+                        49.8047322
+                    ],
+                    [
+                        -119.5296216,
+                        49.8119555
+                    ],
+                    [
+                        -119.5104463,
+                        49.811956
+                    ],
+                    [
+                        -119.5115683,
+                        49.8744325
+                    ],
+                    [
+                        -119.5108946,
+                        49.8744904
+                    ],
+                    [
+                        -119.5114111,
+                        49.8843312
+                    ],
+                    [
+                        -119.5114115,
+                        49.9221763
+                    ],
+                    [
+                        -119.49386,
+                        49.9223477
+                    ],
+                    [
+                        -119.4940505,
+                        49.9313031
+                    ],
+                    [
+                        -119.4803936,
+                        49.9317529
+                    ],
+                    [
+                        -119.4804572,
+                        49.9407474
+                    ],
+                    [
+                        -119.4666732,
+                        49.9409927
+                    ],
+                    [
+                        -119.4692775,
+                        49.9913717
+                    ],
+                    [
+                        -119.4551337,
+                        49.9916078
+                    ],
+                    [
+                        -119.4556736,
+                        50.0121242
+                    ],
+                    [
+                        -119.4416673,
+                        50.0123895
+                    ],
+                    [
+                        -119.4417308,
+                        50.0136345
+                    ],
+                    [
+                        -119.4221492,
+                        50.0140377
+                    ],
+                    [
+                        -119.4221042,
+                        50.0119306
+                    ],
+                    [
+                        -119.4121303,
+                        50.012165
+                    ],
+                    [
+                        -119.4126082,
+                        50.0216913
+                    ],
+                    [
+                        -119.4123387,
+                        50.0216913
+                    ],
+                    [
+                        -119.4124772,
+                        50.0250773
+                    ],
+                    [
+                        -119.4120917,
+                        50.0250821
+                    ],
+                    [
+                        -119.4121954,
+                        50.0270769
+                    ],
+                    [
+                        -119.4126083,
+                        50.0270718
+                    ],
+                    [
+                        -119.4128328,
+                        50.0321946
+                    ],
+                    [
+                        -119.3936313,
+                        50.0326418
+                    ],
+                    [
+                        -119.393529,
+                        50.0307781
+                    ],
+                    [
+                        -119.3795727,
+                        50.0310116
+                    ],
+                    [
+                        -119.3795377,
+                        50.0287584
+                    ],
+                    [
+                        -119.3735764,
+                        50.0288621
+                    ],
+                    [
+                        -119.371544,
+                        49.9793618
+                    ],
+                    [
+                        -119.3573506,
+                        49.9793618
+                    ],
+                    [
+                        -119.3548353,
+                        49.9256081
+                    ],
+                    [
+                        -119.3268079,
+                        49.9257238
+                    ],
+                    [
+                        -119.3256573,
+                        49.8804068
+                    ],
+                    [
+                        -119.3138893,
+                        49.8806528
+                    ],
+                    [
+                        -119.3137097,
+                        49.8771651
+                    ],
+                    [
+                        -119.3132156,
+                        49.877223
+                    ],
+                    [
+                        -119.3131482,
+                        49.8749652
+                    ],
+                    [
+                        -119.312452,
+                        49.8749073
+                    ],
+                    [
+                        -119.3122275,
+                        49.87236
+                    ],
+                    [
+                        -119.3117558,
+                        49.872331
+                    ],
+                    [
+                        -119.3115986,
+                        49.8696098
+                    ],
+                    [
+                        -119.3112169,
+                        49.8694217
+                    ],
+                    [
+                        -119.3109199,
+                        49.8632417
+                    ],
+                    [
+                        -119.3103721,
+                        49.8632724
+                    ],
+                    [
+                        -119.3095139,
+                        49.8512388
+                    ],
+                    [
+                        -119.3106368,
+                        49.8512316
+                    ],
+                    [
+                        -119.3103859,
+                        49.8462564
+                    ],
+                    [
+                        -119.3245344,
+                        49.8459957
+                    ],
+                    [
+                        -119.3246018,
+                        49.8450689
+                    ],
+                    [
+                        -119.3367018,
+                        49.844875
+                    ],
+                    [
+                        -119.3367467,
+                        49.8435136
+                    ],
+                    [
+                        -119.337937,
+                        49.8434702
+                    ],
+                    [
+                        -119.3378023,
+                        49.8382055
+                    ],
+                    [
+                        -119.3383637,
+                        49.8381041
+                    ],
+                    [
+                        -119.3383749,
+                        49.8351202
+                    ],
+                    [
+                        -119.3390936,
+                        49.8351058
+                    ],
+                    [
+                        -119.3388016,
+                        49.8321217
+                    ],
+                    [
+                        -119.3391497,
+                        49.8320565
+                    ],
+                    [
+                        -119.3391722,
+                        49.8293331
+                    ],
+                    [
+                        -119.3394641,
+                        49.8293331
+                    ],
+                    [
+                        -119.3395879,
+                        49.8267878
+                    ],
+                    [
+                        -119.3500053,
+                        49.8265829
+                    ],
+                    [
+                        -119.3493701,
+                        49.8180588
+                    ],
+                    [
+                        -119.4046964,
+                        49.8163785
+                    ],
+                    [
+                        -119.4045694,
+                        49.8099022
+                    ],
+                    [
+                        -119.4101592,
+                        49.8099022
+                    ],
+                    [
+                        -119.4102862,
+                        49.8072787
+                    ],
+                    [
+                        -119.4319467,
+                        49.8069098
+                    ],
+                    [
+                        -119.4322643,
+                        49.7907965
+                    ],
+                    [
+                        -119.4459847,
+                        49.7905504
+                    ],
+                    [
+                        -119.445286,
+                        49.7820201
+                    ],
+                    [
+                        -119.4967376,
+                        49.7811587
+                    ],
+                    [
+                        -119.4966105,
+                        49.7784927
+                    ],
+                    [
+                        -119.5418371,
+                        49.7775082
+                    ],
+                    [
+                        -119.5415892,
+                        49.7718277
+                    ],
+                    [
+                        -119.5560296,
+                        49.7714941
+                    ],
+                    [
+                        -119.5561194,
+                        49.7718422
+                    ],
+                    [
+                        -119.5715704,
+                        49.7715086
+                    ],
+                    [
+                        -119.5716153,
+                        49.7717262
+                    ],
+                    [
+                        -119.5819235,
+                        49.7714941
+                    ],
+                    [
+                        -119.5820133,
+                        49.7717697
+                    ],
+                    [
+                        -119.5922991,
+                        49.7715231
+                    ],
+                    [
+                        -119.592344,
+                        49.7718132
+                    ],
+                    [
+                        -119.6003839,
+                        49.7715957
+                    ],
+                    [
+                        -119.6011924,
+                        49.7839081
+                    ],
+                    [
+                        -119.5864365,
+                        49.7843863
+                    ]
+                ]
+            ],
+            "id": "kelowna_roads",
+            "overlay": true
+        },
+        {
+            "name": "Landsat 233055",
+            "type": "tms",
+            "description": "Recent Landsat imagery",
+            "template": "http://{switch:a,b,c,d}.tile.paulnorman.ca/landsat_233055/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                5,
+                14
+            ],
+            "polygon": [
+                [
+                    [
+                        -60.8550011,
+                        6.1765004
+                    ],
+                    [
+                        -60.4762612,
+                        7.9188291
+                    ],
+                    [
+                        -62.161689,
+                        8.2778675
+                    ],
+                    [
+                        -62.5322549,
+                        6.5375488
+                    ]
+                ]
+            ],
+            "id": "landsat_233055"
+        },
+        {
+            "name": "Latest southwest British Columbia Landsat",
+            "type": "tms",
+            "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,
+                13
+            ],
+            "polygon": [
+                [
+                    [
+                        -121.9355512,
+                        47.7820648
+                    ],
+                    [
+                        -121.5720582,
+                        48.6410125
+                    ],
+                    [
+                        -121.2015461,
+                        49.4846247
+                    ],
+                    [
+                        -121.8375516,
+                        49.6023246
+                    ],
+                    [
+                        -122.4767046,
+                        49.7161735
+                    ],
+                    [
+                        -123.118912,
+                        49.8268824
+                    ],
+                    [
+                        -123.760228,
+                        49.9335836
+                    ],
+                    [
+                        -124.0887706,
+                        49.0870469
+                    ],
+                    [
+                        -124.4128889,
+                        48.2252567
+                    ],
+                    [
+                        -123.792772,
+                        48.1197334
+                    ],
+                    [
+                        -123.1727942,
+                        48.0109592
+                    ],
+                    [
+                        -122.553553,
+                        47.8982299
+                    ]
+                ]
+            ],
+            "id": "landsat_047026"
+        },
+        {
+            "name": "Lithuania - NŽT ORT10LT",
+            "type": "tms",
+            "template": "http://mapproxy.openmap.lt/ort10lt/g/{z}/{x}/{y}.jpeg",
+            "scaleExtent": [
+                4,
+                18
+            ],
+            "polygon": [
+                [
+                    [
+                        21.4926054,
+                        56.3592046
+                    ],
+                    [
+                        21.8134688,
+                        56.4097144
+                    ],
+                    [
+                        21.9728753,
+                        56.4567587
+                    ],
+                    [
+                        22.2158294,
+                        56.4604404
+                    ],
+                    [
+                        22.2183922,
+                        56.4162361
+                    ],
+                    [
+                        23.3511527,
+                        56.4267251
+                    ],
+                    [
+                        23.3521778,
+                        56.3824815
+                    ],
+                    [
+                        23.9179035,
+                        56.383305
+                    ],
+                    [
+                        23.9176231,
+                        56.3392908
+                    ],
+                    [
+                        24.5649817,
+                        56.3382169
+                    ],
+                    [
+                        24.564933,
+                        56.3828587
+                    ],
+                    [
+                        24.6475683,
+                        56.4277798
+                    ],
+                    [
+                        24.8099394,
+                        56.470646
+                    ],
+                    [
+                        24.9733979,
+                        56.4698452
+                    ],
+                    [
+                        25.1299701,
+                        56.2890356
+                    ],
+                    [
+                        25.127433,
+                        56.1990144
+                    ],
+                    [
+                        25.6921076,
+                        56.1933684
+                    ],
+                    [
+                        26.0839005,
+                        56.0067879
+                    ],
+                    [
+                        26.4673573,
+                        55.7304232
+                    ],
+                    [
+                        26.5463565,
+                        55.7132705
+                    ],
+                    [
+                        26.5154447,
+                        55.2345969
+                    ],
+                    [
+                        25.7874641,
+                        54.8425656
+                    ],
+                    [
+                        25.7675259,
+                        54.6350898
+                    ],
+                    [
+                        25.6165253,
+                        54.4404007
+                    ],
+                    [
+                        24.4566043,
+                        53.9577649
+                    ],
+                    [
+                        23.6164786,
+                        53.9575517
+                    ],
+                    [
+                        23.5632006,
+                        54.048085
+                    ],
+                    [
+                        22.8462074,
+                        54.3563682
+                    ],
+                    [
+                        22.831944,
+                        54.9414849
+                    ],
+                    [
+                        22.4306085,
+                        55.1159913
+                    ],
+                    [
+                        21.9605898,
+                        55.1107144
+                    ],
+                    [
+                        21.7253241,
+                        55.1496885
+                    ],
+                    [
+                        21.5628422,
+                        55.2362913
+                    ],
+                    [
+                        21.2209638,
+                        55.2742668
+                    ],
+                    [
+                        21.1630444,
+                        55.2803979
+                    ],
+                    [
+                        20.9277788,
+                        55.3101641
+                    ],
+                    [
+                        20.9257285,
+                        55.3588507
+                    ],
+                    [
+                        20.9980451,
+                        55.4514157
+                    ],
+                    [
+                        21.0282249,
+                        56.0796297
+                    ]
+                ]
+            ],
+            "terms_url": "http://www.geoportal.lt",
+            "terms_text": "NŽT ORT10LT"
+        },
+        {
+            "name": "Locator Overlay",
+            "type": "tms",
+            "description": "Shows major features to help orient you.",
+            "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
+            ],
+            "terms_url": "http://www.mapbox.com/about/maps/",
+            "terms_text": "Terms & Feedback",
+            "default": true,
+            "overlay": true
+        },
+        {
+            "name": "Luxembourg Inspire Ortho 2010",
+            "type": "tms",
+            "template": "http://mapproxy.openstreetmap.lu/tiles/ortho2010/EPSG900913/{z}/{x}/{y}.jpeg",
+            "scaleExtent": [
+                0,
+                20
+            ],
+            "polygon": [
+                [
+                    [
+                        5.961753,
+                        50.17631
+                    ],
+                    [
+                        6.026268,
+                        50.18496
+                    ],
+                    [
+                        6.033182,
+                        50.16395
+                    ],
+                    [
+                        6.060695,
+                        50.15536
+                    ],
+                    [
+                        6.07668,
+                        50.15913
+                    ],
+                    [
+                        6.078237,
+                        50.17255
+                    ],
+                    [
+                        6.101762,
+                        50.17199
+                    ],
+                    [
+                        6.122501,
+                        50.16437
+                    ],
+                    [
+                        6.120101,
+                        50.15594
+                    ],
+                    [
+                        6.127695,
+                        50.14993
+                    ],
+                    [
+                        6.113228,
+                        50.13739
+                    ],
+                    [
+                        6.123691,
+                        50.13719
+                    ],
+                    [
+                        6.140929,
+                        50.1305
+                    ],
+                    [
+                        6.135554,
+                        50.11899
+                    ],
+                    [
+                        6.138082,
+                        50.10263
+                    ],
+                    [
+                        6.131085,
+                        50.09964
+                    ],
+                    [
+                        6.135473,
+                        50.09119
+                    ],
+                    [
+                        6.121939,
+                        50.09059
+                    ],
+                    [
+                        6.126335,
+                        50.07817
+                    ],
+                    [
+                        6.131858,
+                        50.07348
+                    ],
+                    [
+                        6.121171,
+                        50.064
+                    ],
+                    [
+                        6.114444,
+                        50.06139
+                    ],
+                    [
+                        6.115631,
+                        50.05817
+                    ],
+                    [
+                        6.123611,
+                        50.06323
+                    ],
+                    [
+                        6.136608,
+                        50.04178
+                    ],
+                    [
+                        6.130343,
+                        50.02975
+                    ],
+                    [
+                        6.148207,
+                        50.02307
+                    ],
+                    [
+                        6.13868,
+                        50.01572
+                    ],
+                    [
+                        6.135938,
+                        50.01485
+                    ],
+                    [
+                        6.131384,
+                        50.01905
+                    ],
+                    [
+                        6.130243,
+                        50.01819
+                    ],
+                    [
+                        6.139343,
+                        50.01116
+                    ],
+                    [
+                        6.151702,
+                        50.01058
+                    ],
+                    [
+                        6.145464,
+                        49.99689
+                    ],
+                    [
+                        6.139657,
+                        49.9994
+                    ],
+                    [
+                        6.138524,
+                        49.99829
+                    ],
+                    [
+                        6.142178,
+                        49.99535
+                    ],
+                    [
+                        6.150227,
+                        49.99518
+                    ],
+                    [
+                        6.156247,
+                        49.98867
+                    ],
+                    [
+                        6.173045,
+                        49.98589
+                    ],
+                    [
+                        6.17348,
+                        49.98344
+                    ],
+                    [
+                        6.170353,
+                        49.98376
+                    ],
+                    [
+                        6.165487,
+                        49.97115
+                    ],
+                    [
+                        6.171512,
+                        49.96298
+                    ],
+                    [
+                        6.176298,
+                        49.962
+                    ],
+                    [
+                        6.179954,
+                        49.95386
+                    ],
+                    [
+                        6.183393,
+                        49.9548
+                    ],
+                    [
+                        6.179829,
+                        49.96307
+                    ],
+                    [
+                        6.183312,
+                        49.9686
+                    ],
+                    [
+                        6.192774,
+                        49.97158
+                    ],
+                    [
+                        6.199783,
+                        49.95352
+                    ],
+                    [
+                        6.207066,
+                        49.95672
+                    ],
+                    [
+                        6.212689,
+                        49.9514
+                    ],
+                    [
+                        6.225023,
+                        49.95039
+                    ],
+                    [
+                        6.22044,
+                        49.94369
+                    ],
+                    [
+                        6.228241,
+                        49.93726
+                    ],
+                    [
+                        6.22635,
+                        49.92766
+                    ],
+                    [
+                        6.219133,
+                        49.92354
+                    ],
+                    [
+                        6.229862,
+                        49.92125
+                    ],
+                    [
+                        6.236032,
+                        49.91355
+                    ],
+                    [
+                        6.231867,
+                        49.91064
+                    ],
+                    [
+                        6.227694,
+                        49.91062
+                    ],
+                    [
+                        6.232286,
+                        49.9072
+                    ],
+                    [
+                        6.23381,
+                        49.90028
+                    ],
+                    [
+                        6.246919,
+                        49.89535
+                    ],
+                    [
+                        6.257809,
+                        49.88724
+                    ],
+                    [
+                        6.263008,
+                        49.88101
+                    ],
+                    [
+                        6.276455,
+                        49.87725
+                    ],
+                    [
+                        6.281126,
+                        49.87957
+                    ],
+                    [
+                        6.291661,
+                        49.87548
+                    ],
+                    [
+                        6.297699,
+                        49.86673
+                    ],
+                    [
+                        6.309889,
+                        49.87107
+                    ],
+                    [
+                        6.315324,
+                        49.8673
+                    ],
+                    [
+                        6.314651,
+                        49.86057
+                    ],
+                    [
+                        6.323611,
+                        49.85188
+                    ],
+                    [
+                        6.321577,
+                        49.8409
+                    ],
+                    [
+                        6.327406,
+                        49.83673
+                    ],
+                    [
+                        6.336561,
+                        49.83998
+                    ],
+                    [
+                        6.339366,
+                        49.8507
+                    ],
+                    [
+                        6.364651,
+                        49.85164
+                    ],
+                    [
+                        6.402203,
+                        49.82098
+                    ],
+                    [
+                        6.426434,
+                        49.81629
+                    ],
+                    [
+                        6.428071,
+                        49.81186
+                    ],
+                    [
+                        6.43097,
+                        49.81129
+                    ],
+                    [
+                        6.441608,
+                        49.81547
+                    ],
+                    [
+                        6.443442,
+                        49.81233
+                    ],
+                    [
+                        6.45366,
+                        49.81275
+                    ],
+                    [
+                        6.464538,
+                        49.81975
+                    ],
+                    [
+                        6.47057,
+                        49.82385
+                    ],
+                    [
+                        6.496805,
+                        49.81277
+                    ],
+                    [
+                        6.50669,
+                        49.80993
+                    ],
+                    [
+                        6.511554,
+                        49.80238
+                    ],
+                    [
+                        6.51485,
+                        49.80513
+                    ],
+                    [
+                        6.519604,
+                        49.81446
+                    ],
+                    [
+                        6.529808,
+                        49.81048
+                    ],
+                    [
+                        6.532249,
+                        49.80686
+                    ],
+                    [
+                        6.530829,
+                        49.80116
+                    ],
+                    [
+                        6.506225,
+                        49.78899
+                    ],
+                    [
+                        6.519171,
+                        49.78344
+                    ],
+                    [
+                        6.511055,
+                        49.77422
+                    ],
+                    [
+                        6.520563,
+                        49.76818
+                    ],
+                    [
+                        6.520516,
+                        49.76134
+                    ],
+                    [
+                        6.503734,
+                        49.75086
+                    ],
+                    [
+                        6.502627,
+                        49.73298
+                    ],
+                    [
+                        6.507266,
+                        49.72938
+                    ],
+                    [
+                        6.518092,
+                        49.7242
+                    ],
+                    [
+                        6.516417,
+                        49.72129
+                    ],
+                    [
+                        6.511763,
+                        49.72016
+                    ],
+                    [
+                        6.504791,
+                        49.725
+                    ],
+                    [
+                        6.498913,
+                        49.72639
+                    ],
+                    [
+                        6.495576,
+                        49.72443
+                    ],
+                    [
+                        6.507122,
+                        49.71655
+                    ],
+                    [
+                        6.507884,
+                        49.71215
+                    ],
+                    [
+                        6.504598,
+                        49.71227
+                    ],
+                    [
+                        6.427139,
+                        49.66237
+                    ],
+                    [
+                        6.439899,
+                        49.66025
+                    ],
+                    [
+                        6.442511,
+                        49.65591
+                    ],
+                    [
+                        6.421781,
+                        49.61809
+                    ],
+                    [
+                        6.398978,
+                        49.60094
+                    ],
+                    [
+                        6.379408,
+                        49.59526
+                    ],
+                    [
+                        6.375507,
+                        49.58809
+                    ],
+                    [
+                        6.384426,
+                        49.5801
+                    ],
+                    [
+                        6.381188,
+                        49.57509
+                    ],
+                    [
+                        6.369093,
+                        49.5783
+                    ],
+                    [
+                        6.357913,
+                        49.57166
+                    ],
+                    [
+                        6.384902,
+                        49.55817
+                    ],
+                    [
+                        6.380095,
+                        49.54856
+                    ],
+                    [
+                        6.358555,
+                        49.53296
+                    ],
+                    [
+                        6.359322,
+                        49.52481
+                    ],
+                    [
+                        6.370763,
+                        49.50545
+                    ],
+                    [
+                        6.370562,
+                        49.45732
+                    ],
+                    [
+                        6.333403,
+                        49.46493
+                    ],
+                    [
+                        6.321894,
+                        49.47244
+                    ],
+                    [
+                        6.295034,
+                        49.47928
+                    ],
+                    [
+                        6.287889,
+                        49.48379
+                    ],
+                    [
+                        6.271912,
+                        49.49995
+                    ],
+                    [
+                        6.241327,
+                        49.50693
+                    ],
+                    [
+                        6.196692,
+                        49.50331
+                    ],
+                    [
+                        6.173373,
+                        49.50577
+                    ],
+                    [
+                        6.160858,
+                        49.50085
+                    ],
+                    [
+                        6.167099,
+                        49.49006
+                    ],
+                    [
+                        6.140179,
+                        49.48525
+                    ],
+                    [
+                        6.129367,
+                        49.48803
+                    ],
+                    [
+                        6.127247,
+                        49.47081
+                    ],
+                    [
+                        6.101403,
+                        49.46726
+                    ],
+                    [
+                        6.104826,
+                        49.45076
+                    ],
+                    [
+                        6.081667,
+                        49.45417
+                    ],
+                    [
+                        6.077222,
+                        49.46139
+                    ],
+                    [
+                        6.059167,
+                        49.46306
+                    ],
+                    [
+                        6.052222,
+                        49.46028
+                    ],
+                    [
+                        6.044213,
+                        49.44553
+                    ],
+                    [
+                        6.025294,
+                        49.44703
+                    ],
+                    [
+                        6.021545,
+                        49.45127
+                    ],
+                    [
+                        6.01574,
+                        49.44885
+                    ],
+                    [
+                        5.994123,
+                        49.45301
+                    ],
+                    [
+                        5.976569,
+                        49.44885
+                    ],
+                    [
+                        5.977725,
+                        49.45955
+                    ],
+                    [
+                        5.972317,
+                        49.46087
+                    ],
+                    [
+                        5.968912,
+                        49.48202
+                    ],
+                    [
+                        5.9616,
+                        49.49026
+                    ],
+                    [
+                        5.915781,
+                        49.49835
+                    ],
+                    [
+                        5.890334,
+                        49.4948
+                    ],
+                    [
+                        5.863321,
+                        49.50006
+                    ],
+                    [
+                        5.84897,
+                        49.50826
+                    ],
+                    [
+                        5.84828,
+                        49.51397
+                    ],
+                    [
+                        5.83641,
+                        49.51817
+                    ],
+                    [
+                        5.831868,
+                        49.52639
+                    ],
+                    [
+                        5.84308,
+                        49.53081
+                    ],
+                    [
+                        5.835622,
+                        49.54114
+                    ],
+                    [
+                        5.816251,
+                        49.53325
+                    ],
+                    [
+                        5.805201,
+                        49.54272
+                    ],
+                    [
+                        5.859432,
+                        49.57158
+                    ],
+                    [
+                        5.868663,
+                        49.587
+                    ],
+                    [
+                        5.862888,
+                        49.58525
+                    ],
+                    [
+                        5.851102,
+                        49.58379
+                    ],
+                    [
+                        5.847116,
+                        49.58961
+                    ],
+                    [
+                        5.845652,
+                        49.5981
+                    ],
+                    [
+                        5.869401,
+                        49.6106
+                    ],
+                    [
+                        5.881819,
+                        49.63815
+                    ],
+                    [
+                        5.899978,
+                        49.63907
+                    ],
+                    [
+                        5.899339,
+                        49.66239
+                    ],
+                    [
+                        5.856561,
+                        49.67628
+                    ],
+                    [
+                        5.856283,
+                        49.68211
+                    ],
+                    [
+                        5.875703,
+                        49.71118
+                    ],
+                    [
+                        5.864811,
+                        49.72331
+                    ],
+                    [
+                        5.843249,
+                        49.71822
+                    ],
+                    [
+                        5.82191,
+                        49.72128
+                    ],
+                    [
+                        5.824894,
+                        49.73767
+                    ],
+                    [
+                        5.820728,
+                        49.74878
+                    ],
+                    [
+                        5.786264,
+                        49.79079
+                    ],
+                    [
+                        5.765172,
+                        49.78961
+                    ],
+                    [
+                        5.750937,
+                        49.79094
+                    ],
+                    [
+                        5.741591,
+                        49.82126
+                    ],
+                    [
+                        5.745814,
+                        49.82435
+                    ],
+                    [
+                        5.737197,
+                        49.83353
+                    ],
+                    [
+                        5.740531,
+                        49.84142
+                    ],
+                    [
+                        5.747012,
+                        49.84048
+                    ],
+                    [
+                        5.746237,
+                        49.84783
+                    ],
+                    [
+                        5.753989,
+                        49.84878
+                    ],
+                    [
+                        5.740663,
+                        49.85152
+                    ],
+                    [
+                        5.752288,
+                        49.85922
+                    ],
+                    [
+                        5.749545,
+                        49.87554
+                    ],
+                    [
+                        5.775668,
+                        49.87438
+                    ],
+                    [
+                        5.775053,
+                        49.88057
+                    ],
+                    [
+                        5.734598,
+                        49.89341
+                    ],
+                    [
+                        5.733033,
+                        49.90285
+                    ],
+                    [
+                        5.757834,
+                        49.91737
+                    ],
+                    [
+                        5.760393,
+                        49.93252
+                    ],
+                    [
+                        5.770728,
+                        49.93711
+                    ],
+                    [
+                        5.768783,
+                        49.94239
+                    ],
+                    [
+                        5.768802,
+                        49.96104
+                    ],
+                    [
+                        5.786724,
+                        49.96816
+                    ],
+                    [
+                        5.80524,
+                        49.96677
+                    ],
+                    [
+                        5.806521,
+                        49.97321
+                    ],
+                    [
+                        5.831293,
+                        49.97995
+                    ],
+                    [
+                        5.834616,
+                        49.98656
+                    ],
+                    [
+                        5.818057,
+                        49.99936
+                    ],
+                    [
+                        5.815606,
+                        50.01437
+                    ],
+                    [
+                        5.847923,
+                        50.02809
+                    ],
+                    [
+                        5.861889,
+                        50.04581
+                    ],
+                    [
+                        5.850872,
+                        50.0563
+                    ],
+                    [
+                        5.857809,
+                        50.07186
+                    ],
+                    [
+                        5.880997,
+                        50.08069
+                    ],
+                    [
+                        5.891965,
+                        50.12041
+                    ],
+                    [
+                        5.952856,
+                        50.13384
+                    ],
+                    [
+                        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
+                    ],
+                    [
+                        6.026268,
+                        50.18496
+                    ],
+                    [
+                        6.033182,
+                        50.16395
+                    ],
+                    [
+                        6.060695,
+                        50.15536
+                    ],
+                    [
+                        6.07668,
+                        50.15913
+                    ],
+                    [
+                        6.078237,
+                        50.17255
+                    ],
+                    [
+                        6.101762,
+                        50.17199
+                    ],
+                    [
+                        6.122501,
+                        50.16437
+                    ],
+                    [
+                        6.120101,
+                        50.15594
+                    ],
+                    [
+                        6.127695,
+                        50.14993
+                    ],
+                    [
+                        6.113228,
+                        50.13739
+                    ],
+                    [
+                        6.123691,
+                        50.13719
+                    ],
+                    [
+                        6.140929,
+                        50.1305
+                    ],
+                    [
+                        6.135554,
+                        50.11899
+                    ],
+                    [
+                        6.138082,
+                        50.10263
+                    ],
+                    [
+                        6.131085,
+                        50.09964
+                    ],
+                    [
+                        6.135473,
+                        50.09119
+                    ],
+                    [
+                        6.121939,
+                        50.09059
+                    ],
+                    [
+                        6.126335,
+                        50.07817
+                    ],
+                    [
+                        6.131858,
+                        50.07348
+                    ],
+                    [
+                        6.121171,
+                        50.064
+                    ],
+                    [
+                        6.114444,
+                        50.06139
+                    ],
+                    [
+                        6.115631,
+                        50.05817
+                    ],
+                    [
+                        6.123611,
+                        50.06323
+                    ],
+                    [
+                        6.136608,
+                        50.04178
+                    ],
+                    [
+                        6.130343,
+                        50.02975
+                    ],
+                    [
+                        6.148207,
+                        50.02307
+                    ],
+                    [
+                        6.13868,
+                        50.01572
+                    ],
+                    [
+                        6.135938,
+                        50.01485
+                    ],
+                    [
+                        6.131384,
+                        50.01905
+                    ],
+                    [
+                        6.130243,
+                        50.01819
+                    ],
+                    [
+                        6.139343,
+                        50.01116
+                    ],
+                    [
+                        6.151702,
+                        50.01058
+                    ],
+                    [
+                        6.145464,
+                        49.99689
+                    ],
+                    [
+                        6.139657,
+                        49.9994
+                    ],
+                    [
+                        6.138524,
+                        49.99829
+                    ],
+                    [
+                        6.142178,
+                        49.99535
+                    ],
+                    [
+                        6.150227,
+                        49.99518
+                    ],
+                    [
+                        6.156247,
+                        49.98867
+                    ],
+                    [
+                        6.173045,
+                        49.98589
+                    ],
+                    [
+                        6.17348,
+                        49.98344
+                    ],
+                    [
+                        6.170353,
+                        49.98376
+                    ],
+                    [
+                        6.165487,
+                        49.97115
+                    ],
+                    [
+                        6.171512,
+                        49.96298
+                    ],
+                    [
+                        6.176298,
+                        49.962
+                    ],
+                    [
+                        6.179954,
+                        49.95386
+                    ],
+                    [
+                        6.183393,
+                        49.9548
+                    ],
+                    [
+                        6.179829,
+                        49.96307
+                    ],
+                    [
+                        6.183312,
+                        49.9686
+                    ],
+                    [
+                        6.192774,
+                        49.97158
+                    ],
+                    [
+                        6.199783,
+                        49.95352
+                    ],
+                    [
+                        6.207066,
+                        49.95672
+                    ],
+                    [
+                        6.212689,
+                        49.9514
+                    ],
+                    [
+                        6.225023,
+                        49.95039
+                    ],
+                    [
+                        6.22044,
+                        49.94369
+                    ],
+                    [
+                        6.228241,
+                        49.93726
+                    ],
+                    [
+                        6.22635,
+                        49.92766
+                    ],
+                    [
+                        6.219133,
+                        49.92354
+                    ],
+                    [
+                        6.229862,
+                        49.92125
+                    ],
+                    [
+                        6.236032,
+                        49.91355
+                    ],
+                    [
+                        6.231867,
+                        49.91064
+                    ],
+                    [
+                        6.227694,
+                        49.91062
+                    ],
+                    [
+                        6.232286,
+                        49.9072
+                    ],
+                    [
+                        6.23381,
+                        49.90028
+                    ],
+                    [
+                        6.246919,
+                        49.89535
+                    ],
+                    [
+                        6.257809,
+                        49.88724
+                    ],
+                    [
+                        6.263008,
+                        49.88101
+                    ],
+                    [
+                        6.276455,
+                        49.87725
+                    ],
+                    [
+                        6.281126,
+                        49.87957
+                    ],
+                    [
+                        6.291661,
+                        49.87548
+                    ],
+                    [
+                        6.297699,
+                        49.86673
+                    ],
+                    [
+                        6.309889,
+                        49.87107
                     ],
                     [
-                        -119.5465655,
-                        49.7928097
+                        6.315324,
+                        49.8673
                     ],
                     [
-                        -119.5465661,
-                        49.8013837
+                        6.314651,
+                        49.86057
                     ],
                     [
-                        -119.5343374,
-                        49.8013841
+                        6.323611,
+                        49.85188
                     ],
                     [
-                        -119.5343376,
-                        49.8047321
+                        6.321577,
+                        49.8409
                     ],
                     [
-                        -119.5296211,
-                        49.8047322
+                        6.327406,
+                        49.83673
                     ],
                     [
-                        -119.5296216,
-                        49.8119555
+                        6.336561,
+                        49.83998
                     ],
                     [
-                        -119.5104463,
-                        49.811956
+                        6.339366,
+                        49.8507
                     ],
                     [
-                        -119.5115683,
-                        49.8744325
+                        6.364651,
+                        49.85164
                     ],
                     [
-                        -119.5108946,
-                        49.8744904
+                        6.402203,
+                        49.82098
                     ],
                     [
-                        -119.5114111,
-                        49.8843312
+                        6.426434,
+                        49.81629
                     ],
                     [
-                        -119.5114115,
-                        49.9221763
+                        6.428071,
+                        49.81186
                     ],
                     [
-                        -119.49386,
-                        49.9223477
+                        6.43097,
+                        49.81129
                     ],
                     [
-                        -119.4940505,
-                        49.9313031
+                        6.441608,
+                        49.81547
                     ],
                     [
-                        -119.4803936,
-                        49.9317529
+                        6.443442,
+                        49.81233
                     ],
                     [
-                        -119.4804572,
-                        49.9407474
+                        6.45366,
+                        49.81275
                     ],
                     [
-                        -119.4666732,
-                        49.9409927
+                        6.464538,
+                        49.81975
                     ],
                     [
-                        -119.4692775,
-                        49.9913717
+                        6.47057,
+                        49.82385
                     ],
                     [
-                        -119.4551337,
-                        49.9916078
+                        6.496805,
+                        49.81277
                     ],
                     [
-                        -119.4556736,
-                        50.0121242
+                        6.50669,
+                        49.80993
                     ],
                     [
-                        -119.4416673,
-                        50.0123895
+                        6.511554,
+                        49.80238
                     ],
                     [
-                        -119.4417308,
-                        50.0136345
+                        6.51485,
+                        49.80513
                     ],
                     [
-                        -119.4221492,
-                        50.0140377
+                        6.519604,
+                        49.81446
                     ],
                     [
-                        -119.4221042,
-                        50.0119306
+                        6.529808,
+                        49.81048
                     ],
                     [
-                        -119.4121303,
-                        50.012165
+                        6.532249,
+                        49.80686
                     ],
                     [
-                        -119.4126082,
-                        50.0216913
+                        6.530829,
+                        49.80116
                     ],
                     [
-                        -119.4123387,
-                        50.0216913
+                        6.506225,
+                        49.78899
                     ],
                     [
-                        -119.4124772,
-                        50.0250773
+                        6.519171,
+                        49.78344
                     ],
                     [
-                        -119.4120917,
-                        50.0250821
+                        6.511055,
+                        49.77422
                     ],
                     [
-                        -119.4121954,
-                        50.0270769
+                        6.520563,
+                        49.76818
                     ],
                     [
-                        -119.4126083,
-                        50.0270718
+                        6.520516,
+                        49.76134
                     ],
                     [
-                        -119.4128328,
-                        50.0321946
+                        6.503734,
+                        49.75086
                     ],
                     [
-                        -119.3936313,
-                        50.0326418
+                        6.502627,
+                        49.73298
                     ],
                     [
-                        -119.393529,
-                        50.0307781
+                        6.507266,
+                        49.72938
                     ],
                     [
-                        -119.3795727,
-                        50.0310116
+                        6.518092,
+                        49.7242
                     ],
                     [
-                        -119.3795377,
-                        50.0287584
+                        6.516417,
+                        49.72129
                     ],
                     [
-                        -119.3735764,
-                        50.0288621
+                        6.511763,
+                        49.72016
                     ],
                     [
-                        -119.371544,
-                        49.9793618
+                        6.504791,
+                        49.725
                     ],
                     [
-                        -119.3573506,
-                        49.9793618
+                        6.498913,
+                        49.72639
                     ],
                     [
-                        -119.3548353,
-                        49.9256081
+                        6.495576,
+                        49.72443
                     ],
                     [
-                        -119.3268079,
-                        49.9257238
+                        6.507122,
+                        49.71655
                     ],
                     [
-                        -119.3256573,
-                        49.8804068
+                        6.507884,
+                        49.71215
                     ],
                     [
-                        -119.3138893,
-                        49.8806528
+                        6.504598,
+                        49.71227
                     ],
                     [
-                        -119.3137097,
-                        49.8771651
+                        6.427139,
+                        49.66237
                     ],
                     [
-                        -119.3132156,
-                        49.877223
+                        6.439899,
+                        49.66025
                     ],
                     [
-                        -119.3131482,
-                        49.8749652
+                        6.442511,
+                        49.65591
                     ],
                     [
-                        -119.312452,
-                        49.8749073
+                        6.421781,
+                        49.61809
                     ],
                     [
-                        -119.3122275,
-                        49.87236
+                        6.398978,
+                        49.60094
                     ],
                     [
-                        -119.3117558,
-                        49.872331
+                        6.379408,
+                        49.59526
                     ],
                     [
-                        -119.3115986,
-                        49.8696098
+                        6.375507,
+                        49.58809
                     ],
                     [
-                        -119.3112169,
-                        49.8694217
+                        6.384426,
+                        49.5801
                     ],
                     [
-                        -119.3109199,
-                        49.8632417
+                        6.381188,
+                        49.57509
                     ],
                     [
-                        -119.3103721,
-                        49.8632724
+                        6.369093,
+                        49.5783
                     ],
                     [
-                        -119.3095139,
-                        49.8512388
+                        6.357913,
+                        49.57166
                     ],
                     [
-                        -119.3106368,
-                        49.8512316
+                        6.384902,
+                        49.55817
                     ],
                     [
-                        -119.3103859,
-                        49.8462564
+                        6.380095,
+                        49.54856
                     ],
                     [
-                        -119.3245344,
-                        49.8459957
+                        6.358555,
+                        49.53296
                     ],
                     [
-                        -119.3246018,
-                        49.8450689
+                        6.359322,
+                        49.52481
                     ],
                     [
-                        -119.3367018,
-                        49.844875
+                        6.370763,
+                        49.50545
                     ],
                     [
-                        -119.3367467,
-                        49.8435136
+                        6.370562,
+                        49.45732
                     ],
                     [
-                        -119.337937,
-                        49.8434702
+                        6.333403,
+                        49.46493
                     ],
                     [
-                        -119.3378023,
-                        49.8382055
+                        6.321894,
+                        49.47244
                     ],
                     [
-                        -119.3383637,
-                        49.8381041
+                        6.295034,
+                        49.47928
                     ],
                     [
-                        -119.3383749,
-                        49.8351202
+                        6.287889,
+                        49.48379
                     ],
                     [
-                        -119.3390936,
-                        49.8351058
+                        6.271912,
+                        49.49995
                     ],
                     [
-                        -119.3388016,
-                        49.8321217
+                        6.241327,
+                        49.50693
                     ],
                     [
-                        -119.3391497,
-                        49.8320565
+                        6.196692,
+                        49.50331
                     ],
                     [
-                        -119.3391722,
-                        49.8293331
+                        6.173373,
+                        49.50577
                     ],
                     [
-                        -119.3394641,
-                        49.8293331
+                        6.160858,
+                        49.50085
                     ],
                     [
-                        -119.3395879,
-                        49.8267878
+                        6.167099,
+                        49.49006
                     ],
                     [
-                        -119.3500053,
-                        49.8265829
+                        6.140179,
+                        49.48525
                     ],
                     [
-                        -119.3493701,
-                        49.8180588
+                        6.129367,
+                        49.48803
                     ],
                     [
-                        -119.4046964,
-                        49.8163785
+                        6.127247,
+                        49.47081
                     ],
                     [
-                        -119.4045694,
-                        49.8099022
+                        6.101403,
+                        49.46726
                     ],
                     [
-                        -119.4101592,
-                        49.8099022
+                        6.104826,
+                        49.45076
                     ],
                     [
-                        -119.4102862,
-                        49.8072787
+                        6.081667,
+                        49.45417
                     ],
                     [
-                        -119.4319467,
-                        49.8069098
+                        6.077222,
+                        49.46139
                     ],
                     [
-                        -119.4322643,
-                        49.7907965
+                        6.059167,
+                        49.46306
                     ],
                     [
-                        -119.4459847,
-                        49.7905504
+                        6.052222,
+                        49.46028
                     ],
                     [
-                        -119.445286,
-                        49.7820201
+                        6.044213,
+                        49.44553
                     ],
                     [
-                        -119.4967376,
-                        49.7811587
+                        6.025294,
+                        49.44703
                     ],
                     [
-                        -119.4966105,
-                        49.7784927
+                        6.021545,
+                        49.45127
                     ],
                     [
-                        -119.5418371,
-                        49.7775082
+                        6.01574,
+                        49.44885
                     ],
                     [
-                        -119.5415892,
-                        49.7718277
+                        5.994123,
+                        49.45301
                     ],
                     [
-                        -119.5560296,
-                        49.7714941
+                        5.976569,
+                        49.44885
                     ],
                     [
-                        -119.5561194,
-                        49.7718422
+                        5.977725,
+                        49.45955
                     ],
                     [
-                        -119.5715704,
-                        49.7715086
+                        5.972317,
+                        49.46087
                     ],
                     [
-                        -119.5716153,
-                        49.7717262
+                        5.968912,
+                        49.48202
                     ],
                     [
-                        -119.5819235,
-                        49.7714941
+                        5.9616,
+                        49.49026
                     ],
                     [
-                        -119.5820133,
-                        49.7717697
+                        5.915781,
+                        49.49835
                     ],
                     [
-                        -119.5922991,
-                        49.7715231
+                        5.890334,
+                        49.4948
                     ],
                     [
-                        -119.592344,
-                        49.7718132
+                        5.863321,
+                        49.50006
                     ],
                     [
-                        -119.6003839,
-                        49.7715957
+                        5.84897,
+                        49.50826
                     ],
                     [
-                        -119.6011924,
-                        49.7839081
+                        5.84828,
+                        49.51397
                     ],
                     [
-                        -119.5864365,
-                        49.7843863
-                    ]
-                ]
-            ],
-            "id": "kelowna_roads",
-            "overlay": true
-        },
-        {
-            "name": "Landsat 233055",
-            "type": "tms",
-            "description": "Recent Landsat imagery",
-            "template": "http://{switch:a,b,c,d}.tile.paulnorman.ca/landsat_233055/{zoom}/{x}/{y}.png",
-            "scaleExtent": [
-                5,
-                14
-            ],
-            "polygon": [
-                [
+                        5.83641,
+                        49.51817
+                    ],
                     [
-                        -60.8550011,
-                        6.1765004
+                        5.831868,
+                        49.52639
                     ],
                     [
-                        -60.4762612,
-                        7.9188291
+                        5.84308,
+                        49.53081
                     ],
                     [
-                        -62.161689,
-                        8.2778675
+                        5.835622,
+                        49.54114
                     ],
                     [
-                        -62.5322549,
-                        6.5375488
-                    ]
-                ]
-            ],
-            "id": "landsat_233055"
-        },
-        {
-            "name": "Latest southwest British Columbia Landsat",
-            "type": "tms",
-            "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,
-                13
-            ],
-            "polygon": [
-                [
+                        5.816251,
+                        49.53325
+                    ],
                     [
-                        -121.9355512,
-                        47.7820648
+                        5.805201,
+                        49.54272
                     ],
                     [
-                        -121.5720582,
-                        48.6410125
+                        5.859432,
+                        49.57158
                     ],
                     [
-                        -121.2015461,
-                        49.4846247
+                        5.868663,
+                        49.587
                     ],
                     [
-                        -121.8375516,
-                        49.6023246
+                        5.862888,
+                        49.58525
                     ],
                     [
-                        -122.4767046,
-                        49.7161735
+                        5.851102,
+                        49.58379
                     ],
                     [
-                        -123.118912,
-                        49.8268824
+                        5.847116,
+                        49.58961
                     ],
                     [
-                        -123.760228,
-                        49.9335836
+                        5.845652,
+                        49.5981
                     ],
                     [
-                        -124.0887706,
-                        49.0870469
+                        5.869401,
+                        49.6106
                     ],
                     [
-                        -124.4128889,
-                        48.2252567
+                        5.881819,
+                        49.63815
                     ],
                     [
-                        -123.792772,
-                        48.1197334
+                        5.899978,
+                        49.63907
                     ],
                     [
-                        -123.1727942,
-                        48.0109592
+                        5.899339,
+                        49.66239
                     ],
                     [
-                        -122.553553,
-                        47.8982299
-                    ]
-                ]
-            ],
-            "id": "landsat_047026"
-        },
-        {
-            "name": "Lithuania - NŽT ORT10LT",
-            "type": "tms",
-            "template": "http://mapproxy.openmap.lt/ort10lt/g/{z}/{x}/{y}.jpeg",
-            "scaleExtent": [
-                4,
-                18
-            ],
-            "polygon": [
-                [
+                        5.856561,
+                        49.67628
+                    ],
                     [
-                        21.4926054,
-                        56.3592046
+                        5.856283,
+                        49.68211
                     ],
                     [
-                        21.8134688,
-                        56.4097144
+                        5.875703,
+                        49.71118
                     ],
                     [
-                        21.9728753,
-                        56.4567587
+                        5.864811,
+                        49.72331
                     ],
                     [
-                        22.2158294,
-                        56.4604404
+                        5.843249,
+                        49.71822
                     ],
                     [
-                        22.2183922,
-                        56.4162361
+                        5.82191,
+                        49.72128
                     ],
                     [
-                        23.3511527,
-                        56.4267251
+                        5.824894,
+                        49.73767
                     ],
                     [
-                        23.3521778,
-                        56.3824815
+                        5.820728,
+                        49.74878
                     ],
                     [
-                        23.9179035,
-                        56.383305
+                        5.786264,
+                        49.79079
                     ],
                     [
-                        23.9176231,
-                        56.3392908
+                        5.765172,
+                        49.78961
                     ],
                     [
-                        24.5649817,
-                        56.3382169
+                        5.750937,
+                        49.79094
                     ],
                     [
-                        24.564933,
-                        56.3828587
+                        5.741591,
+                        49.82126
                     ],
                     [
-                        24.6475683,
-                        56.4277798
+                        5.745814,
+                        49.82435
                     ],
                     [
-                        24.8099394,
-                        56.470646
+                        5.737197,
+                        49.83353
                     ],
                     [
-                        24.9733979,
-                        56.4698452
+                        5.740531,
+                        49.84142
                     ],
                     [
-                        25.1299701,
-                        56.2890356
+                        5.747012,
+                        49.84048
                     ],
                     [
-                        25.127433,
-                        56.1990144
+                        5.746237,
+                        49.84783
                     ],
                     [
-                        25.6921076,
-                        56.1933684
+                        5.753989,
+                        49.84878
                     ],
                     [
-                        26.0839005,
-                        56.0067879
+                        5.740663,
+                        49.85152
                     ],
                     [
-                        26.4673573,
-                        55.7304232
+                        5.752288,
+                        49.85922
                     ],
                     [
-                        26.5463565,
-                        55.7132705
+                        5.749545,
+                        49.87554
                     ],
                     [
-                        26.5154447,
-                        55.2345969
+                        5.775668,
+                        49.87438
                     ],
                     [
-                        25.7874641,
-                        54.8425656
+                        5.775053,
+                        49.88057
                     ],
                     [
-                        25.7675259,
-                        54.6350898
+                        5.734598,
+                        49.89341
                     ],
                     [
-                        25.6165253,
-                        54.4404007
+                        5.733033,
+                        49.90285
                     ],
                     [
-                        24.4566043,
-                        53.9577649
+                        5.757834,
+                        49.91737
                     ],
                     [
-                        23.6164786,
-                        53.9575517
+                        5.760393,
+                        49.93252
                     ],
                     [
-                        23.5632006,
-                        54.048085
+                        5.770728,
+                        49.93711
                     ],
                     [
-                        22.8462074,
-                        54.3563682
+                        5.768783,
+                        49.94239
                     ],
                     [
-                        22.831944,
-                        54.9414849
+                        5.768802,
+                        49.96104
                     ],
                     [
-                        22.4306085,
-                        55.1159913
+                        5.786724,
+                        49.96816
                     ],
                     [
-                        21.9605898,
-                        55.1107144
+                        5.80524,
+                        49.96677
                     ],
                     [
-                        21.7253241,
-                        55.1496885
+                        5.806521,
+                        49.97321
                     ],
                     [
-                        21.5628422,
-                        55.2362913
+                        5.831293,
+                        49.97995
                     ],
                     [
-                        21.2209638,
-                        55.2742668
+                        5.834616,
+                        49.98656
                     ],
                     [
-                        21.1630444,
-                        55.2803979
+                        5.818057,
+                        49.99936
                     ],
                     [
-                        20.9277788,
-                        55.3101641
+                        5.815606,
+                        50.01437
                     ],
                     [
-                        20.9257285,
-                        55.3588507
+                        5.847923,
+                        50.02809
                     ],
                     [
-                        20.9980451,
-                        55.4514157
+                        5.861889,
+                        50.04581
                     ],
                     [
-                        21.0282249,
-                        56.0796297
+                        5.850872,
+                        50.0563
+                    ],
+                    [
+                        5.857809,
+                        50.07186
+                    ],
+                    [
+                        5.880997,
+                        50.08069
+                    ],
+                    [
+                        5.891965,
+                        50.12041
+                    ],
+                    [
+                        5.952856,
+                        50.13384
+                    ],
+                    [
+                        5.961753,
+                        50.17631
                     ]
                 ]
             ],
-            "terms_url": "http://www.geoportal.lt",
-            "terms_text": "NŽT ORT10LT"
-        },
-        {
-            "name": "Locator Overlay",
-            "type": "tms",
-            "description": "Shows major features to help orient you.",
-            "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
-            ],
-            "terms_url": "http://www.mapbox.com/about/maps/",
-            "terms_text": "Terms & Feedback",
-            "default": true,
-            "overlay": true
+            "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",
@@ -65264,7 +67127,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Currency Exchange"
             },
             "amenity/bus_station": {
+                "icon": "bus",
                 "fields": [
+                    "building_area",
                     "operator"
                 ],
                 "geometry": [
@@ -65459,6 +67324,26 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "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": [
@@ -71079,6 +72964,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "tags": {
                     "power": "sub_station"
                 },
+                "name": "Substation",
+                "searchable": false
+            },
+            "power/substation": {
+                "fields": [
+                    "operator",
+                    "building"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "power": "substation"
+                },
                 "name": "Substation"
             },
             "power/tower": {
@@ -72322,7 +74222,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Garden Center"
             },
             "shop/gift": {
-                "icon": "shop",
+                "icon": "gift",
                 "fields": [
                     "operator",
                     "address",
@@ -73451,8 +75351,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "campsite",
                 "fields": [
                     "operator",
-                    "address",
-                    "smoking"
+                    "address"
                 ],
                 "geometry": [
                     "point",
@@ -73671,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"
@@ -115341,6 +117301,34 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 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,
@@ -116129,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",
@@ -116199,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"
         },
@@ -117231,6 +119221,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "College Grounds",
                     "terms": "university"
                 },
+                "amenity/community_centre": {
+                    "name": "Community Center",
+                    "terms": "event,hall"
+                },
                 "amenity/compressed_air": {
                     "name": "Compressed Air",
                     "terms": ""
@@ -118595,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": ""
@@ -119175,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": ""
@@ -124294,6 +126308,38 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "postcode"
                 ]
             ]
+        },
+        {
+            "countryCodes": [
+                "us"
+            ],
+            "format": [
+                [
+                    "housenumber",
+                    "street"
+                ],
+                [
+                    "city",
+                    "state",
+                    "postcode"
+                ]
+            ]
+        },
+        {
+            "countryCodes": [
+                "ca"
+            ],
+            "format": [
+                [
+                    "housenumber",
+                    "street"
+                ],
+                [
+                    "city",
+                    "province",
+                    "postcode"
+                ]
+            ]
         }
     ]
 };
\ No newline at end of file