OpenLayers OpenLayers

Changeset 1389

Show
Ignore:
Timestamp:
08/26/06 21:46:09 (2 years ago)
Author:
crschmidt
Message:

Multimap now conforms to other EventPane subclasses in expected behavior for
some functions, and has tests available, so when I break it at some point,
hopefully I'll know :)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/lib/OpenLayers/Layer/MultiMap.js

    r1370 r1389  
    238238     */ 
    239239    getOLZoomFromMMZoom: function(mmZoom) { 
    240         return mmZoom - 1; 
     240        if (mmZoom) return mmZoom - 1; 
     241        return null; 
    241242    }, 
    242243     
    …… 
    249250     */ 
    250251    getMMZoomFromOLZoom: function(olZoom) { 
    251         return olZoom + 1; 
     252        if (olZoom) return olZoom + 1; 
     253        return null; 
    252254    }, 
    253255 
    …… 
    327329    }, 
    328330 
     331    destroy: function() { 
     332        this.multimap = null; 
     333        OpenLayers.Layer.EventPane.prototype.destroy.apply(this, arguments);  
     334    }, 
     335 
    329336    /** @final @type String */ 
    330337    CLASS_NAME: "OpenLayers.Layer.MultiMap" 

  • trunk/openlayers/tests/list-tests.html

    r1369 r1389  
    2020    <li>test_Layer_WMS.html</li> 
    2121    <li>test_Layer_Google.html</li> 
     22    <li>test_Layer_MultiMap.html</li> 
    2223    <li>test_Tile.html</li> 
    2324    <li>test_Tile_Image.html</li> 

  • trunk/openlayers/tests/run-tests.html

    r1096 r1389  
    786786{ 
    787787    var test_page=Test.AnotherWay._g_tests_queue[0]; 
    788     test_page.loading_timeout_milliseconds=2000; 
     788    test_page.loading_timeout_milliseconds=4000; 
    789789    test_page.timeout_id=setTimeout( Test.AnotherWay._loading_timeout, Test.AnotherWay._g_timeout_granularity ); 
    790790    test_page.wait_msg=Test.AnotherWay._print_counter_result( test_page.url, "loading...", test_page.loading_timeout_milliseconds, "loading" );