From 1e78c190bbe41fb207627096b8ec65c2ae79dd24 Mon Sep 17 00:00:00 2001 From: Patrick Arlt Date: Fri, 24 Jul 2015 11:57:01 -0700 Subject: [PATCH 1/6] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed35eaced..c9c866cc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [2.0.0-beta.4](v2.0.0-beta.4) +### Breaking + +* Nested namespaces for `L.esri.Layers`, `L.esri.Services` and `L.esri.Tasks`, ``have been removed for better compatibility with ES 2015 modules. This means you should now write `L.esri.query()` for example as opposed to `L.esri.Tasks.query()`. + ### Changed * Tests are now run against the minified production code for more safty. From 843b4dacf46458de7901730553758cf6bf8c9843 Mon Sep 17 00:00:00 2001 From: john gravois Date: Sun, 19 Jul 2015 22:53:24 -0700 Subject: [PATCH 2/6] mostly z-index bumps --- site/source/pages/examples/editing.hbs | 2 +- site/source/pages/examples/feature-layer-popups.hbs | 4 ++-- site/source/pages/examples/finding-features.hbs | 2 +- .../pages/examples/querying-feature-layers-2.hbs | 13 +++++++------ .../pages/examples/simplifying-complex-features.hbs | 2 +- .../examples/styling-feature-layer-polylines.hbs | 2 +- site/source/pages/examples/switching-basemaps.hbs | 2 +- site/source/pages/examples/tile-layer-2.hbs | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/site/source/pages/examples/editing.hbs b/site/source/pages/examples/editing.hbs index ba0428b1c..1ef5ef38e 100644 --- a/site/source/pages/examples/editing.hbs +++ b/site/source/pages/examples/editing.hbs @@ -13,7 +13,7 @@ layout: example.hbs position: absolute; top: 10px; right: 10px; - z-index: 10; + z-index: 400; padding: 1em; background: white; text-align: right; diff --git a/site/source/pages/examples/feature-layer-popups.hbs b/site/source/pages/examples/feature-layer-popups.hbs index 72b6b1531..7b12ccb7d 100644 --- a/site/source/pages/examples/feature-layer-popups.hbs +++ b/site/source/pages/examples/feature-layer-popups.hbs @@ -15,7 +15,7 @@ layout: example.hbs url: 'https://services.arcgis.com/rOo16HdIMeOBI4Mb/arcgis/rest/services/Heritage_Trees_Portland/FeatureServer/0' }).addTo(map); - trees.bindPopup(function (feature) { - return L.Util.template('

{COMMON_NAM}
{SCIENTIFIC}
{NOTES}

', feature.properties); + trees.bindPopup(function (evt) { + return L.Util.template('

{COMMON_NAM}
{SCIENTIFIC}
{NOTES}

', evt.feature.properties); }); diff --git a/site/source/pages/examples/finding-features.hbs b/site/source/pages/examples/finding-features.hbs index ce0448990..311299670 100644 --- a/site/source/pages/examples/finding-features.hbs +++ b/site/source/pages/examples/finding-features.hbs @@ -9,7 +9,7 @@ layout: example.hbs position: absolute; top: 10px; right: 10px; - z-index: 10; + z-index: 400; background: white; padding: 1em; } diff --git a/site/source/pages/examples/querying-feature-layers-2.hbs b/site/source/pages/examples/querying-feature-layers-2.hbs index a828eb286..0eeff7c3e 100644 --- a/site/source/pages/examples/querying-feature-layers-2.hbs +++ b/site/source/pages/examples/querying-feature-layers-2.hbs @@ -13,12 +13,13 @@ layout: example.hbs var stops = L.esri.featureLayer({ url: 'https://services.arcgis.com/rOo16HdIMeOBI4Mb/arcgis/rest/services/Trimet_Transit_Stops/FeatureServer/0', pointToLayer: function (geojson, latlng) { - return L.circleMarker(latlng, { - color: '#5B7CBA', - weight: 2, - opacity: 0.85, - fillOpacity: 0.5 - }); + return L.circleMarker(latlng); + }, + style:{ + color: '#5B7CBA', + weight: 2, + opacity: 0.85, + fillOpacity: 0.5 } }).addTo(map); diff --git a/site/source/pages/examples/simplifying-complex-features.hbs b/site/source/pages/examples/simplifying-complex-features.hbs index da0433328..1d14f4543 100644 --- a/site/source/pages/examples/simplifying-complex-features.hbs +++ b/site/source/pages/examples/simplifying-complex-features.hbs @@ -9,7 +9,7 @@ layout: example.hbs position: absolute; top: 10px; right: 10px; - z-index: 10; + z-index: 400; padding: 1em; background: white; } diff --git a/site/source/pages/examples/styling-feature-layer-polylines.hbs b/site/source/pages/examples/styling-feature-layer-polylines.hbs index 28f90dbdd..9dfc9eb66 100644 --- a/site/source/pages/examples/styling-feature-layer-polylines.hbs +++ b/site/source/pages/examples/styling-feature-layer-polylines.hbs @@ -9,7 +9,7 @@ layout: example.hbs position: absolute; top: 10px; right: 10px; - z-index: 10; + z-index: 400; padding: 1em; background: white; } diff --git a/site/source/pages/examples/switching-basemaps.hbs b/site/source/pages/examples/switching-basemaps.hbs index c5df2fb57..13e7035a8 100644 --- a/site/source/pages/examples/switching-basemaps.hbs +++ b/site/source/pages/examples/switching-basemaps.hbs @@ -9,7 +9,7 @@ layout: example.hbs position: absolute; top: 10px; right: 10px; - z-index: 10; + z-index: 400; background: white; padding: 10px; } diff --git a/site/source/pages/examples/tile-layer-2.hbs b/site/source/pages/examples/tile-layer-2.hbs index a074cd639..9cbc4dff0 100644 --- a/site/source/pages/examples/tile-layer-2.hbs +++ b/site/source/pages/examples/tile-layer-2.hbs @@ -11,6 +11,6 @@ layout: example.hbs L.esri.tiledMapLayer({ url: "http://services.arcgisonline.com/ArcGIS/rest/services/Specialty/World_Navigation_Charts/MapServer", - detectRetina: true + detectRetina: false }).addTo(map); From c8c925b84cfb38fbb192717499460ac8503c6491 Mon Sep 17 00:00:00 2001 From: john gravois Date: Mon, 20 Jul 2015 08:35:27 -0700 Subject: [PATCH 3/6] more z-index bumps --- site/source/pages/examples/getting-service-metadata.hbs | 2 +- site/source/pages/examples/gp-plugin.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/source/pages/examples/getting-service-metadata.hbs b/site/source/pages/examples/getting-service-metadata.hbs index d14d4a684..0fcb03398 100644 --- a/site/source/pages/examples/getting-service-metadata.hbs +++ b/site/source/pages/examples/getting-service-metadata.hbs @@ -9,7 +9,7 @@ layout: example.hbs position: absolute; top: 10px; right: 10px; - z-index: 10; + z-index: 1000; background: white; padding: 1em; } diff --git a/site/source/pages/examples/gp-plugin.hbs b/site/source/pages/examples/gp-plugin.hbs index 502810b6e..094af58a3 100644 --- a/site/source/pages/examples/gp-plugin.hbs +++ b/site/source/pages/examples/gp-plugin.hbs @@ -11,7 +11,7 @@ layout: example.hbs position: absolute; top: 10px; right: 10px; - z-index: 10; + z-index: 1000; padding: 1em; background: white; } From 361a8323a1af28c474c421e859c5463bd4e1835d Mon Sep 17 00:00:00 2001 From: john gravois Date: Mon, 27 Jul 2015 15:13:35 -0700 Subject: [PATCH 4/6] fix dynamicMapLayer constructor snippet --- site/source/pages/api-reference/layers/dynamic-map-layer.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/source/pages/api-reference/layers/dynamic-map-layer.md b/site/source/pages/api-reference/layers/dynamic-map-layer.md index 7880a1fb7..9ecb25c9a 100644 --- a/site/source/pages/api-reference/layers/dynamic-map-layer.md +++ b/site/source/pages/api-reference/layers/dynamic-map-layer.md @@ -223,12 +223,12 @@ dynamicMapLayer.bindPopup( ```js var map = L.map('map').setView([ 38.83,-98.5], 7); - L.esri.basemapLayer('Gray').addTo(map); var url = "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Petroleum/KGS_OilGasFields_Kansas/MapServer"; -L.esri.dynamicMapLayer(url, { +L.esri.dynamicMapLayer({ + url: url, opacity : 0.25 }).addTo(map); From e42705ea9a88aa3d77160b2735b81eeb0aaf32df Mon Sep 17 00:00:00 2001 From: john gravois Date: Mon, 27 Jul 2015 15:17:10 -0700 Subject: [PATCH 5/6] remove console.logs --- src/Layers/FeatureLayer/FeatureLayer.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Layers/FeatureLayer/FeatureLayer.js b/src/Layers/FeatureLayer/FeatureLayer.js index 71a9c81d9..aa7ccd27e 100644 --- a/src/Layers/FeatureLayer/FeatureLayer.js +++ b/src/Layers/FeatureLayer/FeatureLayer.js @@ -148,7 +148,6 @@ export var FeatureLayer = FeatureManager.extend({ }, cellEnter: function (bounds, coords) { - console.log(this._zooming); if (!this._zooming) { L.Util.requestAnimFrame(L.Util.bind(function () { var cacheKey = this._cacheKey(coords); @@ -162,7 +161,6 @@ export var FeatureLayer = FeatureManager.extend({ }, cellLeave: function (bounds, coords) { - console.log(this._zooming); if (!this._zooming) { L.Util.requestAnimFrame(L.Util.bind(function () { var cacheKey = this._cacheKey(coords); From 63f735e17aa74c051535a662036c395ab6bec450 Mon Sep 17 00:00:00 2001 From: john gravois Date: Mon, 27 Jul 2015 15:31:19 -0700 Subject: [PATCH 6/6] bump readme bump readme whoops --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c339b99ac..cbb65f364 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ Here is a quick example to get you started. Just copy/paste into your own `.html - - + +