Support simple GeometryCollection

dyve · Jan 25, 2012 · b4c6a70 · b4c6a70
1 parent 5891c1c
commit b4c6a70
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -23,7 +23,7 @@ <h1>BootMap demo</h1>
     <div id="map2" data-map="map" data-type="json" data-input="#map2_data" style="width: 400px; height: 300px"></div>
 
     <textarea id="map2_data">
-        { "type": "Point", "coordinates": [ 4, 40 ] }
+        { "type": "GeometryCollection", "geometries": [ { "type": "Point", "coordinates": [ 4, 40 ] } ] }
     </textarea>
 
     <div id="map3" data-map="map" data-type="json" data-input="#map3_data" style="width: 400px; height: 300px"></div>

diff --git a/src/bootmap.js b/src/bootmap.js
@@ -178,12 +178,15 @@
         var json = overlayData.json;
         var overlay = null;
         var overlayOptions = {
-            strokeWeight: 3,
-            fillColor: '#55FF55',
-            fillOpacity: 0.5,
             editable: overlayData.editable
-
         };
+        if (json.type === "GeometryCollection") {
+            if (json.geometries.length === 1) {
+                json = json.geometries[0];
+            } else {
+                throw "Bootmap can only handle GeometryCollections of length 1";
+            }
+        }
         switch(json.type) {
             case 'Point':
                 overlayOptions.position = new google.maps.LatLng(json.coordinates[1], json.coordinates[0]);
@@ -205,6 +208,8 @@
                 overlay = new google.maps.Polygon(overlayOptions);
                 addListenersToPolygon(overlay);
                 break;
+            default:
+                throw "Bootmap cannot handle geometries of type '" + json.type + "'";
         }
         if (overlay) {
             overlay.overlayData = overlayData;