OpenLayers OpenLayers

Changeset 5290

Show
Ignore:
Timestamp:
11/27/07 14:01:53 (1 year ago)
Author:
tschaub
Message:

merge r4579:HEAD from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sandbox/tschaub/geom/apidoc_config/Menu.txt

    r4223 r5290  
    5151   Group: Control  { 
    5252 
    53       File: Control  (no auto-title, OpenLayers/Control.js) 
     53      File: Control  (OpenLayers/Control.js) 
    5454      File: ArgParser  (no auto-title, OpenLayers/Control/ArgParser.js) 
    55       File: ZoomToMaxExtent  (no auto-title, OpenLayers/Control/ZoomToMaxExtent.js) 
    56       File: OverviewMap  (no auto-title, OpenLayers/Control/OverviewMap.js) 
     55      File: Attribution  (no auto-title, OpenLayers/Control/Attribution.js) 
    5756      File: DragFeature  (no auto-title, OpenLayers/Control/DragFeature.js) 
    5857      File: DragPan  (no auto-title, OpenLayers/Control/DragPan.js) 
    …… 
    6160      File: KeyboardDefaults  (no auto-title, OpenLayers/Control/KeyboardDefaults.js) 
    6261      File: LayerSwitcher  (no auto-title, OpenLayers/Control/LayerSwitcher.js) 
     62      File: ModifyFeature  (no auto-title, OpenLayers/Control/ModifyFeature.js) 
    6363      File: MouseDefaults  (no auto-title, OpenLayers/Control/MouseDefaults.js) 
    6464      File: MousePosition  (no auto-title, OpenLayers/Control/MousePosition.js) 
    …… 
    6666      File: Navigation  (no auto-title, OpenLayers/Control/Navigation.js) 
    6767      File: NavToolbar  (no auto-title, OpenLayers/Control/NavToolbar.js) 
     68      File: OverviewMap  (no auto-title, OpenLayers/Control/OverviewMap.js) 
    6869      File: Panel  (no auto-title, OpenLayers/Control/Panel.js) 
     70      File: PanZoom  (no auto-title, OpenLayers/Control/PanZoom.js) 
    6971      File: PanZoomBar  (no auto-title, OpenLayers/Control/PanZoomBar.js) 
    7072      File: Permalink  (no auto-title, OpenLayers/Control/Permalink.js) 
    …… 
    7274      File: SelectFeature  (no auto-title, OpenLayers/Control/SelectFeature.js) 
    7375      File: ZoomBox  (no auto-title, OpenLayers/Control/ZoomBox.js) 
    74       File: PanZoom  (OpenLayers/Control/PanZoom.js) 
     76      File: ZoomToMaxExtent  (no auto-title, OpenLayers/Control/ZoomToMaxExtent.js) 
    7577      }  # Group: Control 
    7678 
    …… 
    7981   Group: Feature  { 
    8082 
    81       File: Feature  (no auto-title, OpenLayers/Feature.js) 
     83      File: Feature  (OpenLayers/Feature.js) 
     84      File: Vector  (no auto-title, OpenLayers/Feature/Vector.js) 
    8285      File: WFS  (no auto-title, OpenLayers/Feature/WFS.js) 
    83       File: Vector  (no auto-title, OpenLayers/Feature/Vector.js) 
    8486      }  # Group: Feature 
    8587 

  • sandbox/tschaub/geom/build/license.txt

    r3984 r5290  
    33  OpenLayers.js -- OpenLayers Map Viewer Library 
    44 
    5   Copyright 2005-2007 MetaCarta, Inc., released under a modified BSD license. 
    6   Please see http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
     5  Copyright 2005-2007 MetaCarta, Inc., released under the Clear BSD license. 
     6  Please see http://svn.openlayers.org/trunk/openlayers/license.txt 
    77  for the full text of the license. 
    88 
    …… 
    2222 *  For details, see the Prototype web site: http://prototype.conio.net/ 
    2323 * 
    24 /*--------------------------------------------------------------------------*/ 
     24 *--------------------------------------------------------------------------*/ 
    2525 
    2626/**   

  • sandbox/tschaub/geom/doc/authors.txt

    r3785 r5290  
    44John Cole 
    55Jeff Dege 
     6Roald de Wit 
    67Schuyler Erle 
    78Christian López Espínola 

  • sandbox/tschaub/geom/doc_config/Menu.txt

    r4223 r5290  
    5353      File: Control  (OpenLayers/Control.js) 
    5454      File: ArgParser  (no auto-title, OpenLayers/Control/ArgParser.js) 
    55       File: ZoomToMaxExtent  (no auto-title, OpenLayers/Control/ZoomToMaxExtent.js) 
    56       File: OverviewMap  (no auto-title, OpenLayers/Control/OverviewMap.js) 
     55      File: Attribution  (no auto-title, OpenLayers/Control/Attribution.js) 
    5756      File: DragFeature  (no auto-title, OpenLayers/Control/DragFeature.js) 
    5857      File: DragPan  (no auto-title, OpenLayers/Control/DragPan.js) 
    …… 
    6160      File: KeyboardDefaults  (no auto-title, OpenLayers/Control/KeyboardDefaults.js) 
    6261      File: LayerSwitcher  (no auto-title, OpenLayers/Control/LayerSwitcher.js) 
     62      File: ModifyFeature  (no auto-title, OpenLayers/Control/ModifyFeature.js) 
    6363      File: MouseDefaults  (no auto-title, OpenLayers/Control/MouseDefaults.js) 
    6464      File: MousePosition  (no auto-title, OpenLayers/Control/MousePosition.js) 
    …… 
    6666      File: Navigation  (no auto-title, OpenLayers/Control/Navigation.js) 
    6767      File: NavToolbar  (no auto-title, OpenLayers/Control/NavToolbar.js) 
     68      File: OverviewMap  (no auto-title, OpenLayers/Control/OverviewMap.js) 
    6869      File: Panel  (no auto-title, OpenLayers/Control/Panel.js) 
     70      File: PanZoom  (no auto-title, OpenLayers/Control/PanZoom.js) 
    6971      File: PanZoomBar  (no auto-title, OpenLayers/Control/PanZoomBar.js) 
    7072      File: Permalink  (no auto-title, OpenLayers/Control/Permalink.js) 
    …… 
    7274      File: SelectFeature  (no auto-title, OpenLayers/Control/SelectFeature.js) 
    7375      File: ZoomBox  (no auto-title, OpenLayers/Control/ZoomBox.js) 
    74       File: PanZoom  (no auto-title, OpenLayers/Control/PanZoom.js) 
     76      File: ZoomToMaxExtent  (no auto-title, OpenLayers/Control/ZoomToMaxExtent.js) 
    7577      }  # Group: Control 
    7678 
    …… 
    8082 
    8183      File: Feature  (OpenLayers/Feature.js) 
     84      File: Vector  (no auto-title, OpenLayers/Feature/Vector.js) 
    8285      File: WFS  (no auto-title, OpenLayers/Feature/WFS.js) 
    83       File: Vector  (no auto-title, OpenLayers/Feature/Vector.js) 
    8486      }  # Group: Feature 
    8587 

  • sandbox/tschaub/geom/examples/attribution.html

    r4340 r5290  
    1919 
    2020            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic", 
    21                 "http://wms.jpl.nasa.gov/wms.cgi",  
    22                 {layers: "modis,global_mosaic"},{attribution:"Provided by NASA"}); 
     21                "http://t1.hypercube.telascience.org/cgi-bin/landsat7",  
     22                {layers: "landsat7"},{attribution:"Provided by Telascience"}); 
    2323 
    2424            map.addLayers([ol_wms, jpl_wms]); 

  • sandbox/tschaub/geom/examples/click.html

    r4222 r5290  
    1818 
    1919            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic", 
    20                 "http://wms.jpl.nasa.gov/wms.cgi",  
    21                 {layers: "modis,global_mosaic"}); 
     20                "http://t1.hypercube.telascience.org/tiles/landsat7",  
     21                {layers: "landsat7"}); 
    2222 
    2323            jpl_wms.setVisibility(false); 

  • sandbox/tschaub/geom/examples/controls.html

    r4222 r5290  
    1414            map = new OpenLayers.Map('map', { controls: [] }); 
    1515 
    16             map.addControl(new OpenLayers.Control.PanZoomBar()); 
     16            map.addControl(new OpenLayers.Control.PanZoomBar({zoomWorldIcon:true})); 
    1717            map.addControl(new OpenLayers.Control.MouseToolbar()); 
    1818            map.addControl(new OpenLayers.Control.LayerSwitcher({'ascending':false})); 
    …… 
    2828 
    2929            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic", 
    30                 "http://wms.jpl.nasa.gov/wms.cgi",  
    31                 {layers: "modis,global_mosaic"}); 
     30                "http://t1.hypercube.telascience.org/tiles/landsat7",  
     31                {layers: "landsat7"}); 
    3232 
    3333            var dm_wms = new OpenLayers.Layer.WMS( "DM Solutions Demo", 

  • sandbox/tschaub/geom/examples/editingtoolbar.html

    r2978 r5290  
    99        } 
    1010    </style> 
     11    <script src="../lib/Firebug/firebug.js"></script> 
    1112    <script src="../lib/OpenLayers.js"></script> 
    12     <script src="../lib/Firebug/debug.js"></script> 
    1313    <script type="text/javascript"> 
    1414        <!-- 

  • sandbox/tschaub/geom/examples/example.html

    r3561 r5290  
    6060            }; 
    6161            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic", 
    62                 "http://wms.jpl.nasa.gov/wms.cgi",  
    63                 {layers: "modis,global_mosaic"}, options2); 
     62                "http://t1.hypercube.telascience.org/tiles/landsat7",  
     63                {layers: "landsat7"}, options2); 
    6464 
    6565            var dm_wms = new OpenLayers.Layer.WMS( "DM Solutions Demo", 

  • sandbox/tschaub/geom/examples/fullScreen.html

    r4222 r5290  
    1818 
    1919            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic", 
    20                 "http://wms.jpl.nasa.gov/wms.cgi",  
    21                 {layers: "modis,global_mosaic"}); 
     20                "http://t1.hypercube.telascience.org/tiles/landsat7",  
     21                {layers: "landsat7"}); 
    2222 
    2323            var dm_wms = new OpenLayers.Layer.WMS( "DM Solutions Demo", 

  • sandbox/tschaub/geom/examples/image-layer.html

    r4222 r5290  
    2727 
    2828            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic", 
    29                 "http://wms.jpl.nasa.gov/wms.cgi",  
    30                 {layers: "modis,global_mosaic"}, options); 
     29                "http://t1.hypercube.telascience.org/tiles/landsat7",  
     30                {layers: "landsat7"}, options); 
    3131 
    3232            map.addLayers([graphic, jpl_wms]); 

  • sandbox/tschaub/geom/examples/layerswitcher.html

    r4222 r5290  
    2121 
    2222            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic", 
    23                 "http://wms.jpl.nasa.gov/wms.cgi",  
    24                 {layers: "modis,global_mosaic"}, {'isBaseLayer': false}); 
     23                "http://t1.hypercube.telascience.org/tiles/landsat7",  
     24                {layers: "landsat7"}, {'isBaseLayer': false}); 
    2525 
    2626            var dm_wms = new OpenLayers.Layer.WMS( "DM Solutions Demo", 

  • sandbox/tschaub/geom/examples/lite.html

    r4222 r5290  
    22  <head> 
    33    <style type="text/css"> 
    4         #map { 
    5             width: 800px; 
    6             height: 475px; 
    7             border: 1px solid black; 
    8         } 
     4        #map { width:512px; height:256px; border:1px solid black; } 
    95    </style> 
    106    <script src="../lib/OpenLayers.js"></script> 
    117    <script type="text/javascript"> 
    12         var lon = 5; 
    13         var lat = 40; 
    14         var zoom = 5; 
    158        var map, layer; 
    16  
    179        function init(){ 
    1810            map = new OpenLayers.Map( 'map' ); 
    …… 
    2113                    {layers: 'basic'} ); 
    2214            map.addLayer(layer); 
    23             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom); 
     15            map.zoomToMaxExtent(); 
    2416        } 
    2517    </script> 

  • sandbox/tschaub/geom/examples/mvs.html

    r4320 r5290  
    8989                theMVS.addLayer( 
    9090                    new OpenLayers.Layer.WMS("NASA Mosaic",  
    91                        "http://wms.jpl.nasa.gov/wms.cgi", 
     91                       "http://t1.hypercube.telascience.org/tiles/landsat7", 
    9292                       {"EXCEPTIONS" : "application/vnd.ogc.se_inimage", 
    9393                        "format" : "image/jpeg", 
    94                         layers:"modis,global_mosaic"} 
     94                        layers:"landsat7"} 
    9595                       )); 
    9696                break; 

  • sandbox/tschaub/geom/examples/openmnnd.html

    r4222 r5290  
    3333            wfs.preFeatureInsert= function(feature) { feature.style.strokeWidth="3"; feature.style.strokeColor="blue";   
    3434            } 
    35             wfs.onFeatureInsert = function() { 
     35            wfs.onFeatureInsert = function(feature) { 
    3636              OpenLayers.Util.getElement('stream_features').innerHTML = feature.layer.features.length; 
    3737            }   

  • sandbox/tschaub/geom/examples/overviewmap.html

    r2978 r5290  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
    2         "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd"> 
    3 <html xmlns="http://www.w3.org/1999/xhtml"> 
    4 <head> 
    5 <title>Overview Map Example</title> 
    6 <script src="../lib/OpenLayers.js" type="text/javascript"></script> 
    7 <style> 
    8 #map{ 
    9     width:100%;  
    10     height:500px; 
    11     border:1px solid; 
    12 } 
    13 </style> 
    14 </head> 
    15 <body> 
    16   <div id="map"></div> 
    17   <script defer="defer" type="text/javascript"> 
    18     var map = new OpenLayers.Map('map'); 
    19     // my city 
    20     var constantina = new OpenLayers.LonLat(-5.6165,37.8623); 
    21     var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",  
    22         "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} ); 
    23     var nasa_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",  
    24         "http://wms.jpl.nasa.gov/wms.cgi", {layers: "modis,global_mosaic"} ); 
     1<html> 
     2    <head> 
     3        <title>Overview Map Example</title> 
     4        <script src="../lib/OpenLayers.js" type="text/javascript"></script> 
     5        <style> 
     6        #map1 { 
     7            width: 500px;  
     8            height: 300px; 
     9            border: 1px solid gray; 
     10        } 
     11        #map2 { 
     12            width: 500px;  
     13            height: 300px; 
     14            border: 1px solid gray; 
     15        } 
     16        </style> 
     17    </head> 
     18    <body> 
     19        <div id="map1"></div> 
     20        <p>The above map has an overview map control that is created with 
     21        the default options.  Much like a regular map, the map contained by 
     22        the overview map control defaults to a geographic projection.</p> 
     23        <div id="map2"></div> 
     24        <p>The second map has an overview map control that is created with 
     25        non-default options.  In this case, the mapOptions property of the 
     26        control has been set to use non-default projection related properties. 
     27        In addition, any other properties of the overview map control can be 
     28        set in this way.</p> 
     29        <script defer="defer" type="text/javascript"> 
     30         
     31        // create the top map (with default overview map control) 
     32        var map1 = new OpenLayers.Map('map1'); 
     33         
     34        var ol = new OpenLayers.Layer.WMS( 
     35            "OpenLayers WMS",  
     36            "http://labs.metacarta.com/wms/vmap0", 
     37            {layers: 'basic'} 
     38        ); 
     39         
     40        var jpl = new OpenLayers.Layer.WMS( 
     41            "NASA Global Mosaic",  
     42            "http://t1.hypercube.telascience.org/tiles/landsat7", 
     43            {layers: "landsat7"} 
     44        ); 
     45         
     46        map1.addLayers([ol, jpl]); 
     47        map1.addControl(new OpenLayers.Control.LayerSwitcher()); 
     48         
     49        // create an overview map control with the default options 
     50        var overview1 = new OpenLayers.Control.OverviewMap(); 
     51        map1.addControl(overview1); 
     52         
     53        map1.setCenter(new OpenLayers.LonLat(0, 0), 2); 
     54         
     55        // expand the overview map control 
     56        overview1.maximizeControl(); 
     57         
     58         
     59        // create the bottom map (with advanced overview map control) 
     60        var mapOptions = { 
     61            maxExtent: new OpenLayers.Bounds(33861, 717605, 330846, 1019656),  
     62            maxResolution: 296985/1024, 
     63            projection: "EPSG:2805", 
     64            units: "m" 
     65        }; 
    2566 
    26     map.addLayers([     
    27         nasa_wms, 
    28         wms 
    29     ]); 
    30      
    31     map.addControl(new OpenLayers.Control.LayerSwitcher()); 
    32      
    33     var options = { 
    34       layers: [wms.clone()], 
    35       minRatio: 8, 
    36       maxRatio: 128 
    37     }; 
    38     var overview = new OpenLayers.Control.OverviewMap(options); 
     67        var map2 = new OpenLayers.Map('map2', mapOptions); 
    3968         
    40     map.addControl(overview); 
    41      
    42     map.setCenter(constantina, 4); 
    43      
    44     overview.maximizeControl();     
    45   </script> 
    46 </body> 
     69        var bos = new OpenLayers.Layer.WMS( 
     70            "Boston",  
     71            "http://boston.freemap.in/cgi-bin/mapserv", 
     72            { 
     73                map: '/www/freemap.in/boston/map/gmaps.map',  
     74                layers: 'border,water,roads,rapid_transit,buildings',  
     75                format: 'png' 
     76            } 
     77        ); 
     78         
     79        map2.addLayers([bos]); 
     80        map2.addControl(new OpenLayers.Control.LayerSwitcher()); 
     81         
     82        // create an overview map control with the default options 
     83        var controlOptions = { 
     84            mapOptions: mapOptions 
     85        } 
     86        var overview2 = new OpenLayers.Control.OverviewMap(controlOptions); 
     87        map2.addControl(overview2); 
     88         
     89        map2.setCenter(new OpenLayers.LonLat(182500, 868500), 3); 
     90         
     91        // expand the overview map control 
     92        overview2.maximizeControl(); 
     93 
     94        </script> 
     95    </body> 
    4796</html> 

  • sandbox/tschaub/geom/examples/panel.html

    r4314 r5290  
    5252         
    5353    </style> 
     54    <script src="../lib/Firebug/firebug.js"></script> 
    5455    <script src="../lib/OpenLayers.js"></script> 
    55     <script src="../lib/Firebug/debug.js"></script> 
    5656    <script type="text/javascript"> 
    5757        var lon = 5; 

  • sandbox/tschaub/geom/examples/popups.html

    r4308 r5290  
    88        } 
    99    </style> 
     10    <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script> 
    1011    <script src="../lib/OpenLayers.js"></script> 
    11     <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script> 
    1212    <script type="text/javascript"> 
    1313        var map, layer, popup; 

  • sandbox/tschaub/geom/examples/regular-polygons.html

    r4222 r5290  
    6767             
    6868            document.getElementById('noneToggle').checked = true; 
     69             document.getElementById('irregularToggle').checked = false; 
    6970        } 
    7071        function setOptions(options) { 
    …… 
    147148                    </td> 
    148149                </tr> 
     150                <tr> 
     151                    <td> 
     152                        irregular 
     153                    </td> 
     154                    <td> 
     155                        <input id="irregularToggle" name="irregular" 
     156                               type="checkbox" 
     157                               onchange="setOptions({irregular: this.checked})") /> 
     158                    </td> 
     159                </tr> 
    149160            </tbody> 
    150161        </table> 
    …… 
    157168        will toggle to non-snapping mode. 
    158169    </p> 
     170    <p> 
     171         The <i>irregular</i> option allows drawing of irregular polygons.  With this option, the fixed radius option is ignored. 
    159172  </body> 
    160173</html>