cross origin

calvinmetcalf · Aug 8, 2013 · ed79325 · ed79325
1 parent e7aad12
commit ed79325
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/index.html b/index.html
@@ -23,7 +23,13 @@
 		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');
+    	 var shpfile = new L.Shapefile('congress.zip',{onEachFeature:function(feature, layer) {
+    	if (feature.properties) {
+			layer.bindPopup(Object.keys(feature.properties).map(function(k){
+				return k + ": " + feature.properties[k] ;
+			}).join("<br />"),{maxHeight:200});
+    	}
+	}});
          shpfile.addTo(m);
 		</script>
 	</body>

diff --git a/leaflet.shpfile.js b/leaflet.shpfile.js
@@ -15,7 +15,7 @@ L.Shapefile =L.GeoJSON.extend({
             return self.addData(file);
         }
         if(self.worker){
-            self.worker.data(file).then(function(data){
+            self.worker.data(cw.makeUrl(file)).then(function(data){
                 self.addData(data);
             });
         }else{