| Index: branches/Maps0.8/includes/services/GoogleMaps3/jquery.googlemap.js |
| — | — | @@ -67,6 +67,10 @@ |
| 68 | 68 | var kmlLayer = new google.maps.KmlLayer( options.kml[i], { map: map } ); |
| 69 | 69 | } |
| 70 | 70 | |
| | 71 | + for ( i = options.fusiontables.length - 1; i >= 0; i-- ) { |
| | 72 | + var ftLayer = new google.maps.FusionTablesLayer( options.fusiontables[i], { map: map } ); |
| | 73 | + } |
| | 74 | + |
| 71 | 75 | var layerMapping = { |
| 72 | 76 | 'traffic': 'new google.maps.TrafficLayer()', |
| 73 | 77 | 'bicycling': 'new google.maps.BicyclingLayer()' |
| — | — | @@ -74,6 +78,7 @@ |
| 75 | 79 | |
| 76 | 80 | for ( i = options.layers.length - 1; i >= 0; i-- ) { |
| 77 | 81 | var layer = eval( layerMapping[options.layers[i]] ); |
| | 82 | + layer.setMap( map ); |
| 78 | 83 | } |
| 79 | 84 | |
| 80 | 85 | var bounds; |
| Index: branches/Maps0.8/includes/services/GoogleMaps3/Maps_GoogleMaps3.php |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | */ |
| 40 | 40 | protected static $mapLayers = array( |
| 41 | 41 | 'traffic', |
| 42 | | - 'bicyling' |
| | 42 | + 'bicycling' |
| 43 | 43 | ); |
| 44 | 44 | |
| 45 | 45 | public static $tyepControlStyles = array( |
| — | — | @@ -120,7 +120,10 @@ |
| 121 | 121 | |
| 122 | 122 | $params['kml'] = new ListParameter( 'kml' ); |
| 123 | 123 | $params['kml']->setDefault( array() ); |
| 124 | | - //$params['kml']->addManipulations( new MapsParamFile() ); |
| | 124 | + //$params['kml']->addManipulations( new MapsParamFile() ); |
| | 125 | + |
| | 126 | + $params['fusiontables'] = new ListParameter( 'fusiontables' ); |
| | 127 | + $params['fusiontables']->setDefault( array() ); |
| 125 | 128 | } |
| 126 | 129 | |
| 127 | 130 | /** |
| — | — | @@ -165,7 +168,7 @@ |
| 166 | 169 | * @return array |
| 167 | 170 | */ |
| 168 | 171 | public static function getLayerNames() { |
| 169 | | - return array_keys( self::$mapLayers ); |
| | 172 | + return self::$mapLayers; |
| 170 | 173 | } |
| 171 | 174 | |
| 172 | 175 | /** |