Merge branch '2.12'

kochizufan · Mar 27, 2012 · d1d5ab9 · d1d5ab9
2 parents fb1a49e + eb74d93
commit d1d5ab9
Show file tree

Hide file tree

Showing 52 changed files with 188 additions and 62 deletions.
diff --git a/examples/all-overlays-google.html b/examples/all-overlays-google.html
@@ -15,7 +15,7 @@
     <body onload="init()">
         <h1 id="title">All Overlays with Google and OSM</h1>
         <div id="tags">
-            overlay, baselayer, google, osm, openstreetmap
+            overlay, baselayer, google, osm, openstreetmap, light
         </div>
         <p id="shortdesc">
             Using the Google and OSM layers as overlays.

diff --git a/examples/all-overlays.html b/examples/all-overlays.html
@@ -61,7 +61,7 @@
     <body onload="init()">
         <h1 id="title">OpenLayers Overlays Only Example</h1>
         <div id="tags">
-            overlay, baselayer
+            overlay, baselayer, light
         </div> 
         <p id="shortdesc">
             Demonstrates a map with overlays only.

diff --git a/examples/attribution.html b/examples/attribution.html
@@ -40,7 +40,7 @@
         <h1 id="title">Attribution Example</h1>
 
         <div id="tags">
-            copyright, watermark, logo, attribution
+            copyright, watermark, logo, attribution, light
         </div>
 
         <p id="shortdesc">

diff --git a/examples/bing-tiles.html b/examples/bing-tiles.html
@@ -20,7 +20,7 @@
     <h1 id="title">Basic Bing Tiles Example</h1>
 
     <div id="tags">
-        bing tiles
+        bing tiles, light
     </div>
 
     <div id="shortdesc">Use Bing with direct tile access</div>

diff --git a/examples/bing.html b/examples/bing.html
@@ -48,7 +48,7 @@
     <h1 id="title">Bing Example</h1>
 
     <div id="tags">
-        Bing, Microsoft, Virtual Earth
+        Bing, Microsoft, Virtual Earth, light
     </div>
 
     <p id="shortdesc">

diff --git a/examples/boxes-vector.html b/examples/boxes-vector.html
@@ -45,7 +45,7 @@
         <h1 id="title">Boxes Example Vector</h1>
 
         <div id="tags">
-            box, vector, annotation
+            box, vector, annotation, light
         </div>
 
         <p id="shortdesc">

diff --git a/examples/buffer.html b/examples/buffer.html
@@ -37,7 +37,7 @@
         <h1 id="title">Buffer Example</h1>
 
         <div id="tags">
-            buffer, performance, tile
+            buffer, performance, tile, light
         </div>
 
         <p id="shortdesc">

diff --git a/examples/click.html b/examples/click.html
@@ -70,7 +70,7 @@ <h1 id="title">Click Event Example</h1>
 
         <div id="tags">
             click control, double, doubleclick, double-click, event, events, 
-            propagation
+            propagation, light
         </div>
 
         <p id="shortdesc">

diff --git a/examples/clientzoom.html b/examples/clientzoom.html
@@ -8,7 +8,7 @@
         <link rel="stylesheet" href="../theme/default/style.css" type="text/css"/>
         <link rel="stylesheet" href="style.css" type="text/css">
         <script src="../lib/Firebug/firebug.js"></script>
-        <script src="../lib/OpenLayers.js"></script>
+		<script src="../lib/OpenLayers.js"></script>
         <script src="clientzoom.js"></script>
         <style>
             .olControlAttribution {

diff --git a/examples/custom-control.html b/examples/custom-control.html
@@ -50,7 +50,7 @@
         <h1 id="title">Custom Control Example</h1>
 
         <div id="tags">
-            control, panel, rectangle
+            control, panel, rectangle, light
         </div>
 
         <p id="shortdesc">

diff --git a/examples/example.html b/examples/example.html
@@ -10,7 +10,7 @@
     </head>
     <body>
         <h1 id="title">OpenLayers Example</h1>
-        <div id="tags">simple, basic</div>
+        <div id="tags">simple, basic, light</div>
         <p id="shortdesc">
             Demonstrate a simple map with an overlay that includes layer switching controls.
         </p>

diff --git a/examples/geojson.html b/examples/geojson.html
@@ -63,7 +63,7 @@
     <h1 id="title">GeoJSON Example</h1>
 
     <div id="tags">
-       JSON, GeoJSON
+       JSON, GeoJSON, light
     </div>
 
       <p id="shortdesc">

diff --git a/examples/google-static.html b/examples/google-static.html
@@ -11,7 +11,7 @@
     <body>
         <h1 id="title">Google (Static Maps API) Grid Layer Example</h1>
         <div id="tags">
-            Google, grid, static, GMaps
+            Google, grid, static, GMaps, light
         </div>
         <p id="shortdesc">
             Using the Google Static Maps API with a Grid Layer.

diff --git a/examples/google-v3-alloverlays.html b/examples/google-v3-alloverlays.html
@@ -15,7 +15,7 @@
     <body onload="init()">
         <h1 id="title">Google (v3) allOverlays Layer Example</h1>
         <div id="tags">
-            Google, overlay
+            Google, overlay, light
         </div>
         <p id="shortdesc">
             Demonstrate use the Google Maps v3 API with allOverlays set to true on the map.

diff --git a/examples/google-v3.html b/examples/google-v3.html
@@ -15,7 +15,7 @@
     <body onload="init()">
         <h1 id="title">Google (v3) Layer Example</h1>
         <div id="tags">
-            Google, api key, apikey
+            Google, api key, apikey, light
         </div>
         <p id="shortdesc">
             Demonstrate use the Google Maps v3 API.

diff --git a/examples/graphic-name.html b/examples/graphic-name.html
@@ -14,7 +14,7 @@
     <body onload="init();">
         <h1 id="title">Named Graphics Example</h1>
         <div id="tags">
-            vector, named graphic, star, cross, x, square, triangle, circle, style
+            vector, named graphic, star, cross, x, square, triangle, circle, style, light
         </div>
         <p id="shortdesc">
             Shows how to use well-known graphic names.

diff --git a/examples/gutter.html b/examples/gutter.html
@@ -18,7 +18,7 @@
     <h1 id="title">Gutter Example</h1>
 
     <div id="tags">
-        gutter, quality, tile
+        gutter, quality, tile, light
     </div>
 
     <p id="shortdesc">

diff --git a/examples/late-render.html b/examples/late-render.html
@@ -29,7 +29,7 @@
     <h1 id="title">Late Rendering</h1>
 
     <div id="tags">
-        creation, render, div
+        creation, render, div, light
     </div>
 
     <p id="shortdesc">

diff --git a/examples/layer-opacity.html b/examples/layer-opacity.html
@@ -70,7 +70,7 @@
     <h1 id="title">Layer Opacity Example</h1>
 
     <div id="tags">
-        opacity, transparent, transparency
+        opacity, transparent, transparency, light
     </div>
 
     <p id="shortdesc">

diff --git a/examples/layerLoadMonitoring.html b/examples/layerLoadMonitoring.html
@@ -112,7 +112,7 @@
       <h1 id="title">Layer Load Monitoring Example</h1>
 
       <div id="tags">
-        monitor, loading
+        monitor, loading, light
       </div>
 
       <p id="shortdesc">

diff --git a/examples/layerswitcher.html b/examples/layerswitcher.html
@@ -42,7 +42,7 @@
     <h1 id="title">Layer Switcher Example</h1>
 
     <div id="tags">
-        tree, layerswitcher, reposition
+        tree, layerswitcher, reposition, light
     </div>
 
     <p id="shortdesc">

diff --git a/examples/light-basic.html b/examples/light-basic.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+    <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+        <title>OpenLayers Light - Basic Popups</title>
+        <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+        <link rel="stylesheet" href="style.css" type="text/css">
+        <script src="../OpenLayers.light.debug.js"></script>
+        <script src="light-basic.js"></script>
+    </head>
+    <body onload="init()">
+        <h1 id="title">OpenLayers Light - Basic Popups</h1>
+        <div id="tags">
+            light, vector, feature, popup
+        </div>        
+        <p id="shortdesc">
+            A basic use case example using the OpenLayers.light version of the library.<br>
+            Shows popup info bubble when hovering over features on the map
+        </p>
+
+        <div id="map" class="smallmap"></div>
+
+        <div id="docs">
+            <p>
+                This example uses OpenLayers.light.js to display features and show
+                popup info bubbles when the feature is hovered over.
+            </p>
+                See the <a href="light-basic.js" target="_blank">
+                light-basic.js source</a> to see how this is done.
+            </p>
+        </div>
+    </body>
+</html>
diff --git a/examples/light-basic.js b/examples/light-basic.js
@@ -0,0 +1,66 @@
+var map;
+
+function init() {
+    map = new OpenLayers.Map("map",{projection:"EPSG:3857"});
+
+    var osm = new OpenLayers.Layer.OSM();
+    var toMercator = OpenLayers.Projection.transforms['EPSG:4326']['EPSG:3857'];
+    var center = toMercator({x:-0.05,y:51.5});
+
+    /**
+     * Create 5 random vector features.  Your features would typically be fetched
+     * from the server. The features are given an attribute named "foo".
+     * The value of this attribute is an integer that ranges from 0 to 100.
+     */   
+    var features = [];    
+    for(var i = 0; i < 5; i++) {
+        features[i] = new OpenLayers.Feature.Vector(
+                toMercator(new OpenLayers.Geometry.Point(
+                    -0.040 - 0.05*Math.random(),
+                    51.49 + 0.02*Math.random())), 
+                {
+                    foo : 100 * Math.random() | 0
+                }, {
+                    fillColor : '#008040',
+                    fillOpacity : 0.8,                    
+                    strokeColor : "#ee9900",
+                    strokeOpacity : 1,
+                    strokeWidth : 1,
+                    pointRadius : 8
+                });
+    }
+
+    // create the layer with listeners to create and destroy popups
+    var vector = new OpenLayers.Layer.Vector("Points",{
+        eventListeners:{
+            'featureselected':function(evt){
+                var feature = evt.feature;
+                var popup = new OpenLayers.Popup.FramedCloud("popup",
+                    OpenLayers.LonLat.fromString(feature.geometry.toShortString()),
+                    null,
+                    "<div style='font-size:.8em'>Feature: " + feature.id +"<br>Foo: " + feature.attributes.foo+"</div>",
+                    null,
+                    true
+                );
+                feature.popup = popup;
+                map.addPopup(popup);
+            },
+            'featureunselected':function(evt){
+                var feature = evt.feature;
+                map.removePopup(feature.popup);
+                feature.popup.destroy();
+                feature.popup = null;
+            }
+        }
+    });
+    vector.addFeatures(features);
+
+    // create the select feature control
+    var selector = new OpenLayers.Control.SelectFeature(vector,{
+        autoActivate:true
+    }); 
+
+    map.addLayers([osm, vector]);
+    map.addControl(selector);
+    map.setCenter(new OpenLayers.LonLat(center.x,center.y), 13);
+}
diff --git a/examples/multiserver.html b/examples/multiserver.html
@@ -31,7 +31,7 @@
     <h1 id="title">Multiple Server URLS</h1>
 
   <div id="tags">
-    performance, multiple urls, request
+    performance, multiple urls, request, light
   </div>
   <p id="shortdesc">
       Load your tiles faster by pointing to the same server, but with different urls

diff --git a/examples/navigation-control.html b/examples/navigation-control.html
@@ -26,7 +26,7 @@
     <h1 id="title">Navigation Control</h1>
 
     <div id="tags">
-        drag, move, zoom, navigate
+        drag, move, zoom, navigate, light
     </div>
 
     <div id="shortdesc">Demonstrate Navigation Control features</div>

diff --git a/examples/ordering.html b/examples/ordering.html
@@ -177,7 +177,7 @@
         <h1 id="title">Z-Index/Y-Order Example</h1>
 
         <div id="tags">
-            stack, stacking, zindex, ordering
+            stack, stacking, zindex, ordering, light
         </div>
 
         <p id="shortdesc">

diff --git a/examples/osm-google.html b/examples/osm-google.html
@@ -18,7 +18,7 @@ <h1 id="title">OSM and Google Together</h1>
             Demonstrate use of an OSM layer and a Google layer as base layers.
         </p>
         <div id="tags">
-            openstreetmap google
+            openstreetmap google light
         </div>
         <div id="map" class="smallmap"></div>
         <div id="docs">

diff --git a/examples/osm-grayscale.html b/examples/osm-grayscale.html
@@ -59,7 +59,7 @@
     <h1 id="title">Grayscale OSM Example</h1>
 
     <div id="tags">
-        openstreetmap canvas grayscale
+        openstreetmap canvas grayscale light
     </div>
 
     <div id="shortdesc">Show an OSM Map in grayscale</div>

diff --git a/examples/osm.html b/examples/osm.html
@@ -27,7 +27,7 @@
     <h1 id="title">Basic OSM Example</h1>
 
     <div id="tags">
-        openstreetmap basic
+        openstreetmap basic light
     </div>
 
     <div id="shortdesc">Show a Simple OSM Map</div>

diff --git a/examples/resize-features.html b/examples/resize-features.html
@@ -85,7 +85,7 @@
   <body onload="init()">
     <h1 id="title">Resize Features Programatically</h1>
     <div id="tags">
-        vector, feature, resizing, resize
+        vector, feature, resizing, resize, light
     </div>    
     <p id="shortdesc">
       Demonstration of how to use the geometry resize methods to

diff --git a/examples/restricted-extent.html b/examples/restricted-extent.html
@@ -42,7 +42,7 @@
   <body onload="init()">
     <h1 id="title">OpenLayers Restricted Extent Example</h1>
     <div id="tags">
-        map, restrict, restrictedextent, extent
+        map, restrict, restrictedextent, extent, light
     </div>    
     <p id="shortdesc">
       Don't let users drag outside the map extent: instead, limit dragging such

diff --git a/examples/rotate-features.html b/examples/rotate-features.html
@@ -99,7 +99,7 @@
     <h1 id="title">Rotate vector features</h1>
 
     <div id="tags">
-        vector, feature, rotating, rotation, rotate, advanced
+        vector, feature, rotating, rotation, rotate, advanced, light
     </div>
   <p id="shortdesc">
       Details on how to create and rotate vector features programmatically

diff --git a/examples/select-feature-multilayer.html b/examples/select-feature-multilayer.html
@@ -117,7 +117,7 @@
   <body onload="init()">
     <h1 id="title">OpenLayers Select Feature on Multiple Layers Example</h1>
     <div id="tags">
-        vector, feature, selecting, selection, advanced
+        vector, feature, selecting, selection, advanced, light
     </div>     
     <p id="shortdesc">
       Select a feature on click with the Control.SelectFeature on multiple 

diff --git a/examples/single-tile.html b/examples/single-tile.html
@@ -10,7 +10,7 @@
     </head>
     <body>
         <h1 id="title">Single Tile Example</h1>
-        <div id="tags">tile, ratio, singleTile, performance</div>
+        <div id="tags">tile, ratio, singleTile, performance, light</div>
         <p id="shortdesc">
             Use the singleTile option on gridded layers to request a single tile.
         </p>  

diff --git a/examples/style-rules.html b/examples/style-rules.html
@@ -13,7 +13,7 @@
     <body onload="init()">
         <h1 id="title">Rule Based Style</h1>
         <div id="tags">
-            vector, feature, stylemap, filter, comparison
+            vector, feature, stylemap, filter, comparison, light
         </div>        
         <p id="shortdesc">
             Use rule based styling to use different symbolizers for different