Merge pull request #2 from patrickarlt/gh-pages

add load and loading events

index.html

@@ -27,7 +27,7 @@
 		<script>
 		var m = L.map('map').setView([ 42.09618442380296, -71.5045166015625],8);
         var watercolor = L.tileLayer('http://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.jpg',{attribution:'Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>'}).addTo(m);
-		
+
     	 var shpfile = new L.Shapefile('congress.zip',{onEachFeature:function(feature, layer) {
     	if (feature.properties) {
 			layer.bindPopup(Object.keys(feature.properties).map(function(k){
@@ -36,6 +36,10 @@
     	}
 	}});
          shpfile.addTo(m);
+         shpfile.once("load", function(){
+          console.log("finished loaded shapefile");
+         });
+
 		</script>
 	</body>
 </html>

leaflet.shpfile.js

@@ -11,16 +11,21 @@ L.Shapefile =L.GeoJSON.extend({
     },
     addFileData:function(file){
         var self = this;
+        self.fire('data:loading');
         if(typeof file !== 'string' && !('byteLength' in file)){
-            return self.addData(file);
+            var data = self.addData(file);
+            self.fire('data:loaded');
+            return data;
         }
         if(self.worker){
             self.worker.data(cw.makeUrl(file)).then(function(data){
                 self.addData(data);
+                self.fire('data:loaded');
             });
         }else{
             shp(file).then(function(data){
                 self.addData(data);
+                self.fire('data:loaded');
             });
         }
         return this;