[OpenLayers-Commits] r11855 - sandbox/cmoullet/openlayers/examples

[commits-20090109 at openlayers.org]

Author: cmoullet
Date: 2011-04-01 13:00:06 -0700 (Fri, 01 Apr 2011)
New Revision: 11855

Modified:
   sandbox/cmoullet/openlayers/examples/mobile-base.js
   sandbox/cmoullet/openlayers/examples/mobile-jq.js
   sandbox/cmoullet/openlayers/examples/mobile-sencha.html
Log:
Merge with trunk


Modified: sandbox/cmoullet/openlayers/examples/mobile-base.js
===================================================================
--- sandbox/cmoullet/openlayers/examples/mobile-base.js	2011-04-01 19:54:37 UTC (rev 11854)
+++ sandbox/cmoullet/openlayers/examples/mobile-base.js	2011-04-01 20:00:06 UTC (rev 11855)
@@ -45,8 +45,8 @@
         numZoomLevels: 18,
         maxResolution: 156543.0339,
         maxExtent: new OpenLayers.Bounds(
-                -20037508.34, -20037508.34, 20037508.34, 20037508.34
-                ),
+            -20037508.34, -20037508.34, 20037508.34, 20037508.34
+        ),
         controls: [
             new OpenLayers.Control.Attribution(),
             new OpenLayers.Control.TouchNavigation({
@@ -102,16 +102,16 @@
         vector.removeAllFeatures();
         vector.addFeatures([
             new OpenLayers.Feature.Vector(
-                    e.point,
-            {},
-            {
-                graphicName: 'cross',
-                strokeColor: '#f00',
-                strokeWidth: 2,
-                fillOpacity: 0,
-                pointRadius: 10
-            }
-                    ),
+                e.point,
+                {},
+                {
+                    graphicName: 'cross',
+                    strokeColor: '#f00',
+                    strokeWidth: 2,
+                    fillOpacity: 0,
+                    pointRadius: 10
+                }
+            ),
             new OpenLayers.Feature.Vector(
                 OpenLayers.Geometry.Polygon.createRegularPolygon(
                     new OpenLayers.Geometry.Point(e.point.x, e.point.y),

Modified: sandbox/cmoullet/openlayers/examples/mobile-jq.js
===================================================================
--- sandbox/cmoullet/openlayers/examples/mobile-jq.js	2011-04-01 19:54:37 UTC (rev 11854)
+++ sandbox/cmoullet/openlayers/examples/mobile-jq.js	2011-04-01 20:00:06 UTC (rev 11855)
@@ -1,9 +1,4 @@
 var selectedFeature = null;
-var sprintersLayer;
-var onSelectFeatureFunction = function(feature) {
-   selectedFeature = feature;
-   $.mobile.changePage($("#popup"), "pop");
-};
 
 $(document).ready(function() {
 

Modified: sandbox/cmoullet/openlayers/examples/mobile-sencha.html
===================================================================
--- sandbox/cmoullet/openlayers/examples/mobile-sencha.html	2011-04-01 19:54:37 UTC (rev 11854)
+++ sandbox/cmoullet/openlayers/examples/mobile-sencha.html	2011-04-01 20:00:06 UTC (rev 11855)
@@ -73,9 +73,57 @@
                                         map: map
                                     });
                                 }
-                            ]
-                        }
-                    ],
+                                app.searchFormPopupPanel.show('pop');
+                            }
+                        }, {
+                            iconCls: "locate",
+                            iconMask: true,
+                            handler: function() {
+                                var geolocate = map.getControlsBy("id", "locate-control")[0];
+                                if (geolocate.active) {
+                                    geolocate.getCurrentLocation();
+                                } else {
+                                    geolocate.activate();
+                                }
+                            }
+                        }, {
+                            xtype: "spacer"
+                        }, {
+                            iconMask: true,
+                            iconCls: "add",
+                            handler: function() {
+                                map.zoomIn();
+                            }
+                        }, {
+                            iconMask: true,
+                            iconCls: "minus",
+                            handler: function() {
+                                map.zoomOut();
+                            }
+                        }, {
+                            xtype: "spacer"
+                        }, {
+                            iconMask: true,
+                            iconCls: "layers",
+                            handler: function() {
+                                if (!app.popup) {
+                                    app.popup = new Ext.Panel({
+                                        floating: true,
+                                        modal: true,
+                                        centered: true,
+                                        hideOnMaskTap: true,
+                                        width: 240,
+                                        items: [{
+                                            xtype: 'app_layerlist',
+                                            map: map
+                                        }],
+                                        scroll: 'vertical'
+                                    });
+                                }
+                                app.popup.show('pop');
+                            }
+                        }]
+                    }],
                     items: [
                         {
                             xtype: "component",