resolve merge

CHANGELOG.md

@@ -15,6 +15,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 safety.

README.md

@@ -22,8 +22,8 @@ Here is a quick example to get you started. Just copy/paste into your own `.html
     <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
     <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
 
-    <!-- we encourage you to replace 'latest' with a hardcode version number (like '1.0.0') in production applications -->
-    <script src="//cdn.jsdelivr.net/leaflet.esri/latest/esri-leaflet.js"></script>
+    <!-- Load Esri Leaflet from CDN -->
+    <script src="http://cdn.jsdelivr.net/leaflet.esri/1.0.0/esri-leaflet.js"></script>
 
     <style>
       html, body,  #map {
@@ -40,8 +40,8 @@ Here is a quick example to get you started. Just copy/paste into your own `.html
       L.esri.basemapLayer("Gray").addTo(map);
 
       var parks = L.esri.featureLayer({
-      url: "http://services.arcgis.com/rOo16HdIMeOBI4Mb/arcgis/rest/services/Portland_Parks/FeatureServer/0",
-       style: function () {
+        url: "http://services.arcgis.com/rOo16HdIMeOBI4Mb/arcgis/rest/services/Portland_Parks/FeatureServer/0",
+        style: function () {
           return { color: "#70ca49", weight: 2 };
         }
       }).addTo(map);

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);
 

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;

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('<p>{COMMON_NAM}<br>{SCIENTIFIC}<br>{NOTES}</p>', feature.properties);
+  trees.bindPopup(function (evt) {
+    return L.Util.template('<p>{COMMON_NAM}<br>{SCIENTIFIC}<br>{NOTES}</p>', evt.feature.properties);
   });
 </script>

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;
     }

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;
   }

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;
   }

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);
 

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;
   }

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;
   }

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;
   }

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);
 </script>