diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3ae6ce7d5..58475704ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
### Improvements
+- Added more tile sources to the default list (#1107)
+
+## Version 1.4.1
+
+### Improvements
+
- Add a continuousCloseProximity option to annotations (#1106)
## Version 1.4.0
diff --git a/examples/measure/main.js b/examples/measure/main.js
index 691fd53157..9cdf4e95f2 100644
--- a/examples/measure/main.js
+++ b/examples/measure/main.js
@@ -30,9 +30,9 @@ if (query.extra) {
attribution: 'Microsoft Virtual Earth',
subdomains: '0123',
minLevel: 1,
- maxLevel: 19
+ maxLevel: 19,
+ name: 'Bing Satellite'
};
- $('#basemap option[value="custom"]').before('');
// This requires that you have an appropriate Esri ArcGIS license to use. It
// is possible that its use might be allowed in certain uses via
// https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9
@@ -40,9 +40,9 @@ if (query.extra) {
url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}.png',
attribution: 'Esri World Imagery',
minLevel: 0,
- maxLevel: 19
+ maxLevel: 19,
+ name: 'ArcGIS Satellite'
};
- $('#basemap option[value="custom"]').before('');
}
// Add a blank tile for removing the map
geo.osmLayer.tileSources['false'] = {
diff --git a/src/annotation.js b/src/annotation.js
index 745149cb3e..2eaf39dfba 100644
--- a/src/annotation.js
+++ b/src/annotation.js
@@ -1743,8 +1743,8 @@ var polygonAnnotation = function (args) {
end = true;
}
} else if (vertices.length >= 2 && layer.displayDistance(
- vertices[0], null, evt.map, 'display') <=
- layer.options('finalPointProximity')) {
+ vertices[0], null, evt.map, 'display') <=
+ layer.options('finalPointProximity')) {
end = true;
} else {
vertices[vertices.length - 1] = evt.mapgcs;
diff --git a/tests/cases/annotation.js b/tests/cases/annotation.js
index db03a5a357..91c243f00e 100644
--- a/tests/cases/annotation.js
+++ b/tests/cases/annotation.js
@@ -1368,7 +1368,7 @@ describe('geo.annotation', function () {
expect(ann.processAction(evt)).toBe(true);
expect(ann.options('vertices').length).toBe(4);
// test up near the end of the line
- var evt = {
+ evt = {
state: {action: geo.geo_action.annotation_line},
mouse: {
map: vertices[0],