final module system changes

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "esri-leaflet",
-  "version": "v2.0.0-beta.3",
+  "version": "v2.0.0-beta.4",
   "main": "dist/esri-leaflet.js",
   "ignore": [
     "**/.*",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "esri-leaflet",
   "description": "Leaflet plugins for consuming ArcGIS Online and ArcGIS Server services.",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "author": "Patrick Arlt <[email protected]> (http://patrickarlt.com)",
   "bugs": {
     "url": "https://github.com/esri/esri-leaflet/issues"

src/EsriLeaflet.js

@@ -1,30 +1,30 @@
-export var VERSION = '2.0.0-beta.3';
+export var VERSION = '2.0.0-beta.4';
 
 // import base
-export { Support } from './Support.js';
-export { Util } from './Util.js';
-export { get, post, request } from './Request.js';
+export { Support } from './Support';
+export { Util } from './Util';
+export { get, post, request } from './Request';
 
 // export tasks
-export { Task, task } from './Tasks/Task.js';
-export { Query, query } from './Tasks/Query.js';
-export { Find, find } from './Tasks/Find.js';
-export { Identify, identify } from './Tasks/Identify.js';
-export { IdentifyFeatures, identifyFeatures } from './Tasks/IdentifyFeatures.js';
-export { IdentifyImage, identifyImage } from './Tasks/IdentifyImage.js';
+export { Task, task } from './Tasks/Task';
+export { Query, query } from './Tasks/Query';
+export { Find, find } from './Tasks/Find';
+export { Identify, identify } from './Tasks/Identify';
+export { IdentifyFeatures, identifyFeatures } from './Tasks/IdentifyFeatures';
+export { IdentifyImage, identifyImage } from './Tasks/IdentifyImage';
 
 // export services
-export { Service, service } from './Services/Service.js';
-export { MapService, mapService } from './Services/MapService.js';
-export { ImageService, imageService } from './Services/ImageService.js';
-export { FeatureLayerService, featureLayerService } from './Services/FeatureLayerService.js';
+export { Service, service } from './Services/Service';
+export { MapService, mapService } from './Services/MapService';
+export { ImageService, imageService } from './Services/ImageService';
+export { FeatureLayerService, featureLayerService } from './Services/FeatureLayerService';
 
 // export layers
-export { BasemapLayer, basemapLayer } from './Layers/BasemapLayer.js';
-export { TiledMapLayer, tiledMapLayer } from './Layers/TiledMapLayer.js';
-export { RasterLayer } from './Layers/RasterLayer.js';
-export { ImageMapLayer, imageMapLayer } from './Layers/ImageMapLayer.js';
-export { DynamicMapLayer, dynamicMapLayer } from './Layers/DynamicMapLayer.js';
-export { FeatureGrid } from './Layers/FeatureLayer/FeatureGrid.js';
-export { FeatureManager } from './Layers/FeatureLayer/FeatureManager.js';
-export { FeatureLayer, featureLayer } from './Layers/FeatureLayer/FeatureLayer.js';
+export { BasemapLayer, basemapLayer } from './Layers/BasemapLayer';
+export { TiledMapLayer, tiledMapLayer } from './Layers/TiledMapLayer';
+export { RasterLayer } from './Layers/RasterLayer';
+export { ImageMapLayer, imageMapLayer } from './Layers/ImageMapLayer';
+export { DynamicMapLayer, dynamicMapLayer } from './Layers/DynamicMapLayer';
+export { FeatureGrid } from './Layers/FeatureLayer/FeatureGrid';
+export { FeatureManager } from './Layers/FeatureLayer/FeatureManager';
+export { FeatureLayer, featureLayer } from './Layers/FeatureLayer/FeatureLayer';

src/Layers/BasemapLayer.js

@@ -1,7 +1,7 @@
 import L from 'leaflet';
-import logo from '../Controls/Logo.js';
-import { jsonp } from '../Request.js';
-import { pointerEvents } from '../Support.js';
+import logo from '../Controls/Logo';
+import { jsonp } from '../Request';
+import { pointerEvents } from '../Support';
 
 var tileProtocol = (window.location.protocol !== 'https:') ? 'http:' : 'https:';
 
@@ -266,7 +266,7 @@ export var BasemapLayer = L.TileLayer.extend({
           this._attributions.push({
             attribution: contributor.attribution,
             score: coverageArea.score,
-            bounds: new L.LatLngBounds(southWest, northEast),
+            bounds: [southWest, northEast],
             minZoom: coverageArea.zoomMin,
             maxZoom: coverageArea.zoomMax
           });
@@ -289,6 +289,7 @@ export var BasemapLayer = L.TileLayer.extend({
       for (var i = 0; i < this._attributions.length; i++) {
         var attribution = this._attributions[i];
         var text = attribution.attribution;
+        //debugger;
         if (!newAttributions.match(text) && bounds.intersects(attribution.bounds) && zoom >= attribution.minZoom && zoom <= attribution.maxZoom) {
           newAttributions += (', ' + text);
         }

src/Layers/DynamicMapLayer.js

@@ -1,7 +1,7 @@
 import L from 'leaflet';
-import { RasterLayer } from './RasterLayer.js';
-import { cleanUrl } from '../Util.js';
-import mapService from '../Services/MapService.js';
+import { RasterLayer } from './RasterLayer';
+import { cleanUrl } from '../Util';
+import mapService from '../Services/MapService';
 
 export var DynamicMapLayer = RasterLayer.extend({
 

src/Layers/FeatureLayer/FeatureLayer.js

@@ -1,5 +1,5 @@
 import L from 'leaflet';
-import { FeatureManager } from './FeatureManager.js';
+import { FeatureManager } from './FeatureManager';
 
 export var FeatureLayer = FeatureManager.extend({
 

src/Layers/FeatureLayer/FeatureManager.js

@@ -1,7 +1,7 @@
 import L from 'leaflet';
-import { FeatureGrid } from './FeatureGrid.js';
-import featureLayerService from '../../Services/FeatureLayerService.js';
-import { cleanUrl, warn } from '../../Util.js';
+import { FeatureGrid } from './FeatureGrid';
+import featureLayerService from '../../Services/FeatureLayerService';
+import { cleanUrl, warn } from '../../Util';
 
 export var FeatureManager = FeatureGrid.extend({
   /**

src/Layers/ImageMapLayer.js

@@ -1,7 +1,7 @@
 import L from 'leaflet';
-import { RasterLayer } from './RasterLayer.js';
-import { cleanUrl } from '../Util.js';
-import imageService from '../Services/ImageService.js';
+import { RasterLayer } from './RasterLayer';
+import { cleanUrl } from '../Util';
+import imageService from '../Services/ImageService';
 
 export var ImageMapLayer = RasterLayer.extend({
 

src/Layers/RasterLayer.js

@@ -1,5 +1,5 @@
 import L from 'leaflet';
-import {cors} from '../Support.js';
+import {cors} from '../Support';
 
 export var RasterLayer = L.Layer.extend({
 

src/Layers/TiledMapLayer.js

@@ -1,6 +1,6 @@
 import L from 'leaflet';
-import {warn, cleanUrl} from '../Util.js';
-import mapService from '../Services/MapService.js';
+import {warn, cleanUrl} from '../Util';
+import mapService from '../Services/MapService';
 
 export var TiledMapLayer = L.TileLayer.extend({
   options: {

src/Request.js

@@ -1,6 +1,6 @@
 import L from 'leaflet';
-import Support from './Support.js';
-import {warn} from './Util.js';
+import Support from './Support';
+import {warn} from './Util';
 
 var callbacks = 0;
 

src/Services/FeatureLayerService.js

@@ -1,6 +1,6 @@
-import { Service } from './Service.js';
-import query from '../Tasks/Query.js';
-import { geojsonToArcGIS } from '../Util.js';
+import { Service } from './Service';
+import query from '../Tasks/Query';
+import { geojsonToArcGIS } from '../Util';
 
 export var FeatureLayerService = Service.extend({
 

src/Services/ImageService.js

@@ -1,6 +1,6 @@
-import { Service } from './Service.js';
-import identifyImage from '../Tasks/IdentifyImage.js';
-import query from '../Tasks/Query.js';
+import { Service } from './Service';
+import identifyImage from '../Tasks/IdentifyImage';
+import query from '../Tasks/Query';
 
 export var ImageService = Service.extend({
 

src/Services/MapService.js

@@ -1,7 +1,7 @@
-import { Service } from './Service.js';
-import identifyFeatures from '../Tasks/IdentifyFeatures.js';
-import query from '../Tasks/Query.js';
-import find from '../Tasks/Find.js';
+import { Service } from './Service';
+import identifyFeatures from '../Tasks/IdentifyFeatures';
+import query from '../Tasks/Query';
+import find from '../Tasks/Find';
 
 export var MapService = Service.extend({
 

src/Services/Service.js

@@ -1,7 +1,7 @@
 import L from 'leaflet';
-import {cors} from '../Support.js';
-import {cleanUrl} from '../Util.js';
-import Request from '../Request.js';
+import {cors} from '../Support';
+import {cleanUrl} from '../Util';
+import Request from '../Request';
 
 export var Service = L.Evented.extend({
 

src/Tasks/Find.js

@@ -1,5 +1,5 @@
-import { Task } from './Task.js';
-import Util from '../Util.js';
+import { Task } from './Task';
+import Util from '../Util';
 
 export var Find = Task.extend({
   setters: {

src/Tasks/Identify.js

@@ -1,4 +1,4 @@
-import { Task } from './Task.js';
+import { Task } from './Task';
 
 export var Identify = Task.extend({
   path: 'identify',

src/Tasks/IdentifyFeatures.js

@@ -1,6 +1,6 @@
 import L from 'leaflet';
-import { Identify } from './Identify.js';
-import Util from '../Util.js';
+import { Identify } from './Identify';
+import Util from '../Util';
 
 export var IdentifyFeatures = Identify.extend({
   setters: {

src/Tasks/IdentifyImage.js

@@ -1,6 +1,6 @@
 import L from 'leaflet';
-import { Identify } from './Identify.js';
-import Util from '../Util.js';
+import { Identify } from './Identify';
+import Util from '../Util';
 
 export var IdentifyImage = Identify.extend({
   setters: {

src/Tasks/Query.js

@@ -1,6 +1,6 @@
 import L from 'leaflet';
-import { Task } from './Task.js';
-import Util from '../Util.js';
+import { Task } from './Task';
+import Util from '../Util';
 
 export var Query = Task.extend({
   setters: {

src/Tasks/Task.js

@@ -1,7 +1,7 @@
 import L from 'leaflet';
-import {cors} from '../Support.js';
-import {cleanUrl} from '../Util.js';
-import Request from '../Request.js';
+import {cors} from '../Support';
+import {cleanUrl} from '../Util';
+import Request from '../Request';
 
 export var Task = L.Class.extend({