[OpenLayers-Commits] r11509 - in sandbox/pinch: . build examples
examples/img img lib/OpenLayers lib/OpenLayers/BaseTypes
lib/OpenLayers/Control lib/OpenLayers/Handler
lib/OpenLayers/Layer tests tests/BaseTypes tests/Control
tests/Handler tests/Layer theme/default/img tools
commits-20090109 at openlayers.org
commits-20090109 at openlayers.org
Fri Feb 25 10:14:41 EST 2011
Author: tschaub
Date: 2011-02-25 07:14:40 -0800 (Fri, 25 Feb 2011)
New Revision: 11509
Added:
sandbox/pinch/examples/accelerometer.html
sandbox/pinch/examples/img/check-round-green.png
sandbox/pinch/examples/img/check-round-grey.png
sandbox/pinch/examples/img/list.png
sandbox/pinch/examples/img/minus1.png
sandbox/pinch/examples/mobile-base.js
sandbox/pinch/examples/mobile-sencha.js
sandbox/pinch/tools/closure.py
sandbox/pinch/tools/closure_ws.py
Modified:
sandbox/pinch/
sandbox/pinch/build/README.txt
sandbox/pinch/build/build.py
sandbox/pinch/build/mobile.cfg
sandbox/pinch/examples/bing.html
sandbox/pinch/examples/mobile-jq.html
sandbox/pinch/examples/mobile-sencha.html
sandbox/pinch/examples/mobile.html
sandbox/pinch/examples/mobile.js
sandbox/pinch/examples/spherical-mercator.html
sandbox/pinch/examples/tile-origin.html
sandbox/pinch/img/cloud-popup-relative.png
sandbox/pinch/img/drag-rectangle-off.png
sandbox/pinch/img/drag-rectangle-on.png
sandbox/pinch/img/east-mini.png
sandbox/pinch/img/layer-switcher-maximize.png
sandbox/pinch/img/layer-switcher-minimize.png
sandbox/pinch/img/marker-blue.png
sandbox/pinch/img/marker-gold.png
sandbox/pinch/img/marker-green.png
sandbox/pinch/img/marker.png
sandbox/pinch/img/measuring-stick-off.png
sandbox/pinch/img/measuring-stick-on.png
sandbox/pinch/img/north-mini.png
sandbox/pinch/img/panning-hand-off.png
sandbox/pinch/img/panning-hand-on.png
sandbox/pinch/img/slider.png
sandbox/pinch/img/south-mini.png
sandbox/pinch/img/west-mini.png
sandbox/pinch/img/zoom-minus-mini.png
sandbox/pinch/img/zoom-plus-mini.png
sandbox/pinch/img/zoom-world-mini.png
sandbox/pinch/img/zoombar.png
sandbox/pinch/lib/OpenLayers/BaseTypes/Pixel.js
sandbox/pinch/lib/OpenLayers/Control/Geolocate.js
sandbox/pinch/lib/OpenLayers/Control/MouseDefaults.js
sandbox/pinch/lib/OpenLayers/Control/MouseToolbar.js
sandbox/pinch/lib/OpenLayers/Control/OverviewMap.js
sandbox/pinch/lib/OpenLayers/Handler/Box.js
sandbox/pinch/lib/OpenLayers/Handler/Click.js
sandbox/pinch/lib/OpenLayers/Layer/Grid.js
sandbox/pinch/lib/OpenLayers/Layer/VirtualEarth.js
sandbox/pinch/lib/OpenLayers/Map.js
sandbox/pinch/tests/BaseTypes/Pixel.html
sandbox/pinch/tests/Control/Geolocate.html
sandbox/pinch/tests/Handler/Click.html
sandbox/pinch/tests/Layer/ArcGIS93Rest.html
sandbox/pinch/tests/Layer/Grid.html
sandbox/pinch/tests/Layer/KaMap.html
sandbox/pinch/tests/Layer/MapGuide.html
sandbox/pinch/tests/Layer/MapServer.html
sandbox/pinch/tests/Layer/TMS.html
sandbox/pinch/tests/Layer/WMS.html
sandbox/pinch/tests/Layer/WrapDateLine.html
sandbox/pinch/tests/Layer/XYZ.html
sandbox/pinch/tests/Map.html
sandbox/pinch/theme/default/img/add_point_off.png
sandbox/pinch/theme/default/img/drag-rectangle-off.png
sandbox/pinch/theme/default/img/drag-rectangle-on.png
sandbox/pinch/theme/default/img/draw_line_off.png
sandbox/pinch/theme/default/img/draw_line_on.png
sandbox/pinch/theme/default/img/draw_point_off.png
sandbox/pinch/theme/default/img/draw_point_on.png
sandbox/pinch/theme/default/img/draw_polygon_off.png
sandbox/pinch/theme/default/img/draw_polygon_on.png
sandbox/pinch/theme/default/img/editing_tool_bar.png
sandbox/pinch/theme/default/img/move_feature_off.png
sandbox/pinch/theme/default/img/move_feature_on.png
sandbox/pinch/theme/default/img/navigation_history.png
sandbox/pinch/theme/default/img/pan-panel-NOALPHA.png
sandbox/pinch/theme/default/img/pan-panel.png
sandbox/pinch/theme/default/img/pan_on.png
sandbox/pinch/theme/default/img/panning-hand-off.png
sandbox/pinch/theme/default/img/panning-hand-on.png
sandbox/pinch/theme/default/img/remove_point_on.png
sandbox/pinch/theme/default/img/save_features_off.png
sandbox/pinch/theme/default/img/save_features_on.png
sandbox/pinch/theme/default/img/view_next_off.png
sandbox/pinch/theme/default/img/view_previous_off.png
sandbox/pinch/theme/default/img/zoom-panel.png
sandbox/pinch/tools/
sandbox/pinch/tools/release.sh
sandbox/pinch/tools/update_dev_dir.sh
Log:
Merge r11431:11507 from trunk.
Property changes on: sandbox/pinch
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/roberthl/openlayers:9745-9748
+ /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11431-11507
Modified: sandbox/pinch/build/README.txt
===================================================================
--- sandbox/pinch/build/README.txt 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/build/README.txt 2011-02-25 15:14:40 UTC (rev 11509)
@@ -1,14 +1,43 @@
+The OpenLayers build tool supports several different
+forms of compressing your javascript code, and a method
+of describing build profiles to create customized
+OpenLayers builds with only the components you need.
-## HowTo: Build & deploy "Shrunk" Single File Library version of OpenLayers ##
+When building a file, you can choose to build with several
+different compression options to the Python-based build.py
+script. The following is an example script:
- * Build:
+python build.py -c closure full OpenLayers-closure.js
- cd build
- ./build.py
- cd ..
+This script selects the 'closure' compression mechanism,
+uses a config file called 'full.cfg', and writes the output
+to OpenLayers-closure.js.
- * Upload the result to the server: e.g.
+The options available for compression are:
- scp build/OpenLayers.js openlayers at openlayers.org:openlayers.org/htdocs/code/
+ * closure
+ This requires you to have a closure-compiler.jar in your
+ tools directory. You can do this by fetching the compiler
+ from:
+ http://closure-compiler.googlecode.com/files/compiler-latest.zip
+ Then unzipping that file, and placing compiler.jar into tools
+ and renaming it closure-compiler.jar.
+
+ * closure_ws
+ This uses the closure compiler webservice. This will only work
+ for files source Javascript files which are under 1MB. (Note that
+ the default OpenLayers full build is not under 1MB.)
+
+ * jsmin
+ jsmin is the default compiler, and uses the Python-based
+ jsmin script to compress the Javascript.
+
+ * minimize
+ This is a simple whitespace removing Python script, designed
+ to fill in when other tools are unavailable.
+
+ * none
+ None will leave the Javascript uncompressed.
+
Modified: sandbox/pinch/build/build.py
===================================================================
--- sandbox/pinch/build/build.py 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/build/build.py 2011-02-25 15:14:40 UTC (rev 11509)
@@ -12,6 +12,16 @@
have_compressor.append("jsmin")
except ImportError:
print "No jsmin"
+ try:
+ import closure
+ have_compressor.append("closure")
+ except Exception, E:
+ print "No closure (%s) % E"
+ try:
+ import closure_ws
+ have_compressor.append("closure_ws")
+ except ImportError:
+ print "No closure_ws"
try:
import minimize
@@ -39,14 +49,16 @@
print "Merging libraries."
merged = mergejs.run(sourceDirectory, None, configFilename)
+ print "Compressing using %s" % use_compressor
if use_compressor == "jsmin":
- print "Compressing using jsmin."
minimized = jsmin.jsmin(merged)
elif use_compressor == "minimize":
- print "Compressing using minimize."
minimized = minimize.minimize(merged)
+ elif use_compressor == "closure_ws":
+ minimized = closure_ws.minimize(merged)
+ elif use_compressor == "closure":
+ minimized = closure.minimize(merged)
else: # fallback
- print "Not compressing."
minimized = merged
print "Adding license file."
minimized = file("license.txt").read() + minimized
@@ -60,4 +72,11 @@
opt = optparse.OptionParser(usage="%s [options] [config_file] [output_file]\n Default config_file is 'full.cfg', Default output_file is 'OpenLayers.js'")
opt.add_option("-c", "--compressor", dest="compressor", help="compression method: one of 'jsmin', 'minimize', or 'none'", default="jsmin")
(options, args) = opt.parse_args()
- build(*args, options=options)
+ if not len(args):
+ build(options=options)
+ elif len(args) == 1:
+ build(args[0], options=options)
+ elif len(args) == 2:
+ build(args[0], args[1], options=options)
+ else:
+ print "Wrong number of arguments"
Modified: sandbox/pinch/build/mobile.cfg
===================================================================
--- sandbox/pinch/build/mobile.cfg 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/build/mobile.cfg 2011-02-25 15:14:40 UTC (rev 11509)
@@ -12,6 +12,9 @@
OpenLayers/Control/TouchNavigation.js
OpenLayers/Control/Geolocate.js
OpenLayers/Control/ZoomPanel.js
+OpenLayers/Control/Attribution.js
+OpenLayers/Layer/Vector.js
+OpenLayers/Renderer/SVG.js
[exclude]
Copied: sandbox/pinch/examples/accelerometer.html (from rev 11507, trunk/openlayers/examples/accelerometer.html)
===================================================================
--- sandbox/pinch/examples/accelerometer.html (rev 0)
+++ sandbox/pinch/examples/accelerometer.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <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 Accelerometer Usage</title>
+ <link rel="stylesheet" href="../theme/default/style.css" type="text/css"/>
+ <link rel="stylesheet" href="style.css" type="text/css"/>
+ <script type="text/javascript" src="browser.js"></script>
+
+ <style type="text/css">
+ .olControlAttribution {
+ bottom: 5px;
+ }
+ </style>
+ <script type="text/javascript">
+ function init() {
+ if (isEventSupported('deviceorientation', window) || isEventSupported('mozorientation', window) || isEventSupported('devicemotion', window)) {
+ if (window.DeviceOrientationEvent) {
+ window.addEventListener("deviceorientation", function (event) {
+ document.getElementById('resultDeviceOrientation').innerHTML = '';
+ if (typeof(event.alpha) != 'undefined') {
+ document.getElementById('resultDeviceOrientation').innerHTML = document.getElementById('resultDeviceOrientation').innerHTML + "Alpha: " + event.alpha + "<br>";
+ document.getElementById('resultDeviceOrientation').innerHTML = document.getElementById('resultDeviceOrientation').innerHTML + "Beta: " + event.beta + "<br>";
+ document.getElementById('resultDeviceOrientation').innerHTML = document.getElementById('resultDeviceOrientation').innerHTML + "Gamma: " + event.gamma + "<br>";
+ }
+ if (typeof(event.absolute) != 'undefined') {
+ document.getElementById('resultDeviceOrientation').innerHTML = document.getElementById('resultDeviceOrientation').innerHTML + "Gamma: " + event.absolute + "<br>";
+ }
+ if (typeof(event.compassCalibrate) != 'undefined') {
+ document.getElementById('resultDeviceOrientation').innerHTML = document.getElementById('resultDeviceOrientation').innerHTML + "Gamma: " + event.compassCalibrated + "<br>";
+ }
+ }, true);
+ }
+ if (window.DeviceMotionEvent) {
+ window.addEventListener('devicemotion', function (event) {
+ document.getElementById('resultDeviceMotion').innerHTML = '';
+ if (typeof(event.accelerationIncludingGravity) != 'undefined') {
+ document.getElementById('resultDeviceMotion').innerHTML = document.getElementById('resultDeviceMotion').innerHTML + "accelerationIncludingGravity.x: " + event.accelerationIncludingGravity.x + "<br>";
+ document.getElementById('resultDeviceMotion').innerHTML = document.getElementById('resultDeviceMotion').innerHTML + "accelerationIncludingGravity.y: " + event.accelerationIncludingGravity.y + "<br>";
+ document.getElementById('resultDeviceMotion').innerHTML = document.getElementById('resultDeviceMotion').innerHTML + "accelerationIncludingGravity.z: " + event.accelerationIncludingGravity.z + "<br>";
+ }
+ if (typeof(event.acceleration) != 'undefined') {
+ document.getElementById('resultDeviceMotion').innerHTML = document.getElementById('resultDeviceMotion').innerHTML + "acceleration.x: " + event.acceleration.x + "<br>";
+ document.getElementById('resultDeviceMotion').innerHTML = document.getElementById('resultDeviceMotion').innerHTML + "acceleration.y: " + event.acceleration.y + "<br>";
+ document.getElementById('resultDeviceMotion').innerHTML = document.getElementById('resultDeviceMotion').innerHTML + "acceleration.z: " + event.acceleration.z + "<br>";
+ }
+ if (typeof(event.rotationRate) != 'undefined') {
+ document.getElementById('resultDeviceMotion').innerHTML = document.getElementById('resultDeviceMotion').innerHTML + "rotationRate.alpha: " + event.rotationRate.alpha + "<br>";
+ document.getElementById('resultDeviceMotion').innerHTML = document.getElementById('resultDeviceMotion').innerHTML + "rotationRate.beta: " + event.rotationRate.beta + "<br>";
+ document.getElementById('resultDeviceMotion').innerHTML = document.getElementById('resultDeviceMotion').innerHTML + "rotationRate.gamma: " + event.rotationRate.gamma + "<br>";
+ }
+ }, true);
+ }
+ if (window.MozOrientation) {
+ window.addEventListener("MozOrientation", function (orientation) {
+ document.getElementById('resultMozOrientation').innerHTML = "orientation.x: " + orientation.x + "<br>";
+ document.getElementById('resultMozOrientation').innerHTML = document.getElementById('resultMozOrientation').innerHTML + "orientation.y: " + orientation.y + "<br>";
+ document.getElementById('resultMozOrientation').innerHTML = document.getElementById('resultMozOrientation').innerHTML + "orientation.z: " + orientation.z + "<br>";
+ }, true);
+ }
+ } else {
+ alert("Unfortunately, your brower doesn't support the orientation usage");
+ }
+
+ }
+ </script>
+</head>
+<body onload="init()">
+<h1 id="title">Accelerometer</h1>
+
+<p id="shortdesc">
+ The goal of this script is to demonstrate the usage of accelerometer.
+</p>
+<p>
+ The orientation specification can be found <a href="http://dev.w3.org/geo/api/spec-source-orientation.html">here</a>.
+</p>
+
+<div id="tags">
+ browser, vendor, mobile, orientation
+</div>
+
+<h1>Device motion</h1>
+
+<div id="resultDeviceMotion">
+
+</div>
+<h1>Device orientation</h1>
+
+<div id="resultDeviceOrientation">
+
+</div>
+<h1>MOZ orientation</h1>
+
+<div id="resultMozOrientation">
+
+</div>
+</body>
+</html>
Modified: sandbox/pinch/examples/bing.html
===================================================================
--- sandbox/pinch/examples/bing.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/examples/bing.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -12,9 +12,18 @@
<script>
var map;
-
+
function init(){
- map = new OpenLayers.Map("map");
+ // setting restrictedExtent so that we can use the
+ // VirtualEarth-layers, see e.g.
+ // http://dev.openlayers.org/apidocs/files/OpenLayers/Layer/VirtualEarth-js.html
+ var restrictedExtent = new OpenLayers.Bounds(-20037508, -20037508,
+ 20037508, 20037508);
+
+ map = new OpenLayers.Map("map", {
+ restrictedExtent: restrictedExtent
+ });
+
map.addControl(new OpenLayers.Control.LayerSwitcher());
var shaded = new OpenLayers.Layer.VirtualEarth("Shaded", {
Copied: sandbox/pinch/examples/img/check-round-green.png (from rev 11507, trunk/openlayers/examples/img/check-round-green.png)
===================================================================
(Binary files differ)
Copied: sandbox/pinch/examples/img/check-round-grey.png (from rev 11507, trunk/openlayers/examples/img/check-round-grey.png)
===================================================================
(Binary files differ)
Copied: sandbox/pinch/examples/img/list.png (from rev 11507, trunk/openlayers/examples/img/list.png)
===================================================================
(Binary files differ)
Copied: sandbox/pinch/examples/img/minus1.png (from rev 11507, trunk/openlayers/examples/img/minus1.png)
===================================================================
(Binary files differ)
Copied: sandbox/pinch/examples/mobile-base.js (from rev 11507, trunk/openlayers/examples/mobile-base.js)
===================================================================
--- sandbox/pinch/examples/mobile-base.js (rev 0)
+++ sandbox/pinch/examples/mobile-base.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -0,0 +1,108 @@
+// API key for http://openlayers.org. Please get your own at
+// http://bingmapsportal.com/ and use that instead.
+var apiKey = "AqTGBsziZHIJYYxgivLBf0hVdrAk9mWO5cQcb8Yux8sW5M8c8opEC2lZqKR1ZZXf";
+
+// initialize map when page ready
+var map;
+var gg = new OpenLayers.Projection("EPSG:4326");
+var sm = new OpenLayers.Projection("EPSG:900913");
+
+var init = function () {
+
+ var vector = new OpenLayers.Layer.Vector("Vector Layer", {});
+
+ var geolocate = new OpenLayers.Control.Geolocate({
+ id: 'locate-control',
+ geolocationOptions: {
+ enableHighAccuracy: false,
+ maximumAge: 0,
+ timeout: 7000
+ }
+ });
+ // create map
+ map = new OpenLayers.Map({
+ div: "map",
+ theme: null,
+ projection: sm,
+ units: "m",
+ numZoomLevels: 18,
+ maxResolution: 156543.0339,
+ maxExtent: new OpenLayers.Bounds(
+ -20037508.34, -20037508.34, 20037508.34, 20037508.34
+ ),
+ controls: [
+ new OpenLayers.Control.Attribution(),
+ new OpenLayers.Control.TouchNavigation({
+ dragPanOptions: {
+ interval: 100,
+ enableKinetic: true
+ }
+ }),
+ geolocate
+ ],
+ layers: [
+ new OpenLayers.Layer.OSM("OpenStreetMap", null, {
+ transitionEffect: 'resize'
+ }),
+ new OpenLayers.Layer.Bing({
+ key: apiKey,
+ type: "Road",
+ // custom metadata parameter to request the new map style - only useful
+ // before May 1st, 2011
+ metadataParams: {
+ mapVersion: "v1"
+ },
+ name: "Bing Road",
+ transitionEffect: 'resize'
+ }),
+ new OpenLayers.Layer.Bing({
+ key: apiKey,
+ type: "Aerial",
+ name: "Bing Aerial",
+ transitionEffect: 'resize'
+ }),
+ new OpenLayers.Layer.Bing({
+ key: apiKey,
+ type: "AerialWithLabels",
+ name: "Bing Aerial + Labels",
+ transitionEffect: 'resize'
+ }),
+ vector
+ ]
+ });
+ map.zoomToMaxExtent();
+
+ var style = {
+ fillOpacity: 0.1,
+ fillColor: '#000',
+ strokeColor: '#f00',
+ strokeOpacity: 0.6
+ };
+ geolocate.events.register("locationupdated",this,function(e) {
+ vector.removeAllFeatures();
+ vector.addFeatures([
+ new OpenLayers.Feature.Vector(
+ 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),
+ e.position.coords.accuracy/2,
+ 50,
+ 0
+ ),
+ {},
+ style
+ )
+ ]);
+ map.zoomToExtent(vector.getDataExtent());
+ });
+};
Modified: sandbox/pinch/examples/mobile-jq.html
===================================================================
--- sandbox/pinch/examples/mobile-jq.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/examples/mobile-jq.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -11,7 +11,7 @@
<script src="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.js"></script>
<link rel="stylesheet" href="style.mobile.css" type="text/css">
<script src="../lib/OpenLayers.js"></script>
- <script src="mobile.js"></script>
+ <script src="mobile-base.js"></script>
<style>
html {
height: 100%;
Modified: sandbox/pinch/examples/mobile-sencha.html
===================================================================
--- sandbox/pinch/examples/mobile-sencha.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/examples/mobile-sencha.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -5,12 +5,30 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>OpenLayers with Sencha Touch</title>
- <script src="../lib/OpenLayers.js"></script>
+ <script src="../lib/OpenLayers.js?mobile"></script>
<link rel="stylesheet" href="style.mobile.css" type="text/css">
<link rel="stylesheet" href="http://dev.sencha.com/deploy/touch/resources/css/sencha-touch.css">
<script src="http://dev.sencha.com/deploy/touch/sencha-touch.js"></script>
- <script src="mobile.js"></script>
+ <script src="mobile-sencha.js"></script>
+ <script src="mobile-base.js"></script>
<style>
+ .searchList {
+ min-height: 150px;
+ }
+ .close-btn {
+ position: absolute;
+ right: 10px;
+ top: 10px;
+ }
+ img.minus {
+ -webkit-mask-image: url(img/minus1.png);
+ }
+ img.layers {
+ -webkit-mask-image: url(img/list.png);
+ }
+ .gx-layer-item {
+ margin-left: 10px;
+ }
#map {
width: 100%;
height: 100%;
@@ -25,100 +43,96 @@
}
</style>
<script>
-
- new Ext.Application({
+
+ var app = new Ext.Application({
name: "ol",
launch: function() {
this.viewport = new Ext.Panel({
fullscreen: true,
dockedItems: [{
- dock: "top",
+ dock: "bottom",
xtype: "toolbar",
ui: "light",
layout: {
pack: "center"
},
- defaults: {
- ui: "plain",
- iconMask: true
- },
items: [{
- iconCls: "arrow_left",
+ iconCls: "search",
+ iconMask: true,
+ handler: function(){
+ // this is the app
+ if (!app.searchFormPopupPanel) {
+ app.searchFormPopupPanel = new App.SearchFormPopupPanel({
+ map: map
+ });
+ }
+ app.searchFormPopupPanel.show('pop');
+ }
+ }, {
+ iconCls: "locate",
+ iconMask: true,
handler: function() {
- pan(-0.25, 0);
+ var geolocate = map.getControlsBy("id", "locate-control")[0];
+ if (geolocate.active) {
+ geolocate.getCurrentLocation();
+ } else {
+ geolocate.activate();
+ }
}
}, {
- iconCls: "arrow_up",
+ xtype: "spacer"
+ }, {
+ iconMask: true,
+ iconCls: "add",
handler: function() {
- pan(0, -0.25);
+ map.zoomIn();
}
}, {
- iconCls: "arrow_down",
+ iconMask: true,
+ iconCls: "minus",
handler: function() {
- pan(0, 0.25);
+ map.zoomOut();
}
}, {
- iconCls: "arrow_right",
+ xtype: "spacer"
+ }, {
+ iconMask: true,
+ iconCls: "layers",
handler: function() {
- pan(0.25, 0);
- }
- }]
- }, {
- dock: "bottom",
- xtype: "toolbar",
- ui: "light",
- layout: {
- pack: "center"
- },
- items: [{
- xtype: "segmentedbutton",
- items: [{
- text: "navigate",
- pressed: true
- }, {
- text: "point",
- id: "point"
- }, {
- text: "line",
- id: "line"
- }, {
- text: "poly",
- id: "poly"
- }, {
- text: "modify",
- id: "mod"
- }],
- listeners: {
- toggle: function(container, button, pressed) {
- Ext.each(map.getControlsByClass(/DrawFeature/), function(control) {
- control.deactivate();
+ 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'
});
- map.getControlsBy("id", "mod-control")[0].deactivate();
- if (pressed) {
- var id = button.id + "-control";
- var control = map.getControlsBy("id", id)[0];
- if (control) {
- control.activate();
- }
- }
}
+ app.popup.show('pop');
}
}]
}],
- items: [{
- xtype: "component",
- scroll: false,
- monitorResize: true,
- id: "map",
- listeners: {
- render: init,
- resize: function() {
- if (window.map) {
- map.updateSize();
+ items: [
+ {
+ xtype: "component",
+ scroll: false,
+ monitorResize: true,
+ id: "map",
+ listeners: {
+ render: init,
+ resize: function() {
+ if (window.map) {
+ map.updateSize();
+ }
}
}
}
- }]
+ ]
});
}
});
Copied: sandbox/pinch/examples/mobile-sencha.js (from rev 11507, trunk/openlayers/examples/mobile-sencha.js)
===================================================================
--- sandbox/pinch/examples/mobile-sencha.js (rev 0)
+++ sandbox/pinch/examples/mobile-sencha.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -0,0 +1,198 @@
+Ext.ns('App');
+
+/**
+ * The model for the geonames records used in the search
+ */
+Ext.regModel('Geonames', {
+ fields: ['countryName', 'toponymName', 'name', 'lat', 'lng']
+});
+
+/**
+ * Custom class for the Search
+ */
+App.SearchFormPopupPanel = Ext.extend(Ext.Panel, {
+ map: null,
+ floating: true,
+ modal: true,
+ centered: true,
+ hideOnMaskTap: true,
+ width: Ext.is.Phone ? undefined : 400,
+ height: Ext.is.Phone ? undefined : 400,
+ scroll: false,
+ layout: 'fit',
+ fullscreen: Ext.is.Phone ? true : undefined,
+ url: 'http://ws.geonames.org/searchJSON?',
+ errorText: 'Sorry, we had problems communicating with geonames.org. Please try again.',
+ errorTitle: 'Communication error',
+ maxResults: 6,
+ featureClass: "P",
+
+ createStore: function(){
+ this.store = new Ext.data.Store({
+ model: 'Geonames',
+ proxy: {
+ type: 'scripttag',
+ timeout: 5000,
+ listeners: {
+ exception: function(){
+ this.hide();
+ Ext.Msg.alert(this.errorTitle, this.errorText, Ext.emptyFn);
+ },
+ scope: this
+ },
+ url: this.url,
+ reader: {
+ type: 'json',
+ root: 'geonames'
+ }
+ }
+ });
+ },
+
+ doSearch: function(searchfield, evt){
+ var q = searchfield.getValue();
+ this.store.load({
+ params: {
+ featureClass: this.featureClass,
+ maxRows: this.maxResults,
+ name_startsWith: encodeURIComponent(q)
+ }
+ });
+ },
+
+ onItemTap: function(dataView, index, item, event){
+ var record = this.store.getAt(index);
+ var lon = record.get('lng');
+ var lat = record.get('lat');
+ var lonlat = new OpenLayers.LonLat(lon, lat);
+ map.setCenter(lonlat.transform(gg, sm), 12);
+ this.hide("pop");
+ },
+
+ initComponent: function(){
+ this.createStore();
+ this.resultList = new Ext.List({
+ scroll: 'vertical',
+ cls: 'searchList',
+ loadingText: "Searching ...",
+ store: this.store,
+ itemTpl: '<div>{name} ({countryName})</div>',
+ listeners: {
+ itemtap: this.onItemTap,
+ scope: this
+ }
+ });
+ this.formContainer = new Ext.form.FormPanel({
+ scroll: false,
+ items: [{
+ xtype: 'button',
+ cls: 'close-btn',
+ ui: 'decline-small',
+ text: 'Close',
+ handler: function(){
+ this.hide();
+ },
+ scope: this
+ }, {
+ xtype: 'fieldset',
+ scroll: false,
+ title: 'Search for a place',
+ items: [{
+ xtype: 'searchfield',
+ label: 'Search',
+ placeHolder: 'placename',
+ listeners: {
+ action: this.doSearch,
+ scope: this
+ }
+ },
+ this.resultList
+ ]
+ }]
+ });
+ this.items = [{
+ xtype: 'panel',
+ layout: 'fit',
+ items: [this.formContainer]
+ }];
+ App.SearchFormPopupPanel.superclass.initComponent.call(this);
+ }
+});
+
+App.LayerList = Ext.extend(Ext.List, {
+
+ map: null,
+
+ createStore: function(){
+ Ext.regModel('Layer', {
+ fields: ['id', 'name', 'visibility', 'zindex']
+ });
+ var data = [];
+ Ext.each(this.map.layers, function(layer){
+ if (layer.displayInLayerSwitcher === true) {
+ var visibility = layer.isBaseLayer ? (this.map.baseLayer == layer) : layer.getVisibility();
+ data.push({
+ id: layer.id,
+ name: layer.name,
+ visibility: visibility,
+ zindex: layer.getZIndex()
+ });
+ }
+ });
+ return new Ext.data.Store({
+ model: 'Layer',
+ sorters: 'zindex',
+ data: data
+ });
+ },
+
+ initComponent: function(){
+ this.store = this.createStore();
+ this.itemTpl = new Ext.XTemplate(
+ '<tpl if="visibility == true">',
+ '<img width="20" src="img/check-round-green.png">',
+ '</tpl>',
+ '<tpl if="visibility == false">',
+ '<img width="20" src="img/check-round-grey.png">',
+ '</tpl>',
+ '<span class="gx-layer-item">{name}</span>'
+ );
+ this.listeners = {
+ itemtap: function(dataview, index, item, e){
+ var record = dataview.getStore().getAt(index);
+ var layer = this.map.getLayersBy("id", record.get("id"))[0];
+ if (layer.isBaseLayer) {
+ this.map.setBaseLayer(layer);
+ }
+ else {
+ layer.setVisibility(!layer.getVisibility());
+ }
+ record.set("visibility", layer.getVisibility());
+ }
+ };
+ this.map.events.on({
+ "changelayer": this.onChangeLayer,
+ scope: this
+ });
+ App.LayerList.superclass.initComponent.call(this);
+ },
+
+ findLayerRecord: function(layer){
+ var found;
+ this.store.each(function(record){
+ if (record.get("id") === layer.id) {
+ found = record;
+ }
+ }, this);
+ return found;
+ },
+
+ onChangeLayer: function(evt){
+ if (evt.property == "visibility") {
+ var record = this.findLayerRecord(evt.layer);
+ record.set("visibility", evt.layer.getVisibility());
+ }
+ }
+
+});
+Ext.reg('app_layerlist', App.LayerList);
Modified: sandbox/pinch/examples/mobile.html
===================================================================
--- sandbox/pinch/examples/mobile.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/examples/mobile.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -2,6 +2,7 @@
<html>
<head>
<title>OpenLayers Mobile</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0;">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="stylesheet" href="style.mobile.css" type="text/css">
@@ -9,20 +10,61 @@
<script src="mobile.js"></script>
<style>
html, body {
- margin: 0;
- padding: 0;
- height: 100%;
+ margin : 0;
+ padding : 0;
+ height : 100%;
+ width : 100%;
}
+ @media only screen and (max-width: 600px) {
+ html, body {
+ height : 117%;
+ }
+ }
#map {
- position: relative;
- width: 100%;
- height: 100%;
+ width : 100%;
+ position : relative;
+ height : 100%;
}
.olControlAttribution {
- font-size: 10px;
- bottom: 5px;
- right: 5px;
+ position : absolute;
+ font-size : 10px;
+ bottom : 0 !important;
+ right : 0 !important;
+ background : rgba(0,0,0,0.1);
+ font-family : Arial;
+ padding : 2px 4px;
+ border-radius : 5px 0 0 0;
}
+ div.olControlZoomPanel .olControlZoomInItemInactive,
+ div.olControlZoomPanel .olControlZoomOutItemInactive {
+ background: rgba(0,0,0,0.2);
+ position: absolute;
+ }
+ div.olControlZoomPanel .olControlZoomInItemInactive {
+ border-radius: 5px 5px 0 0;
+ }
+ div.olControlZoomPanel .olControlZoomOutItemInactive {
+ border-radius: 0 0 5px 5px ;
+ top: 37px;
+ }
+ div.olControlZoomPanel .olControlZoomOutItemInactive:after ,
+ div.olControlZoomPanel .olControlZoomInItemInactive:after{
+ font-weight: bold;
+ content : '+';
+ font-size : 36px;
+ padding: 7px;
+ z-index: 2000;
+ color : #fff;
+ line-height: 1em;
+ }
+ div.olControlZoomPanel .olControlZoomOutItemInactive:after{
+ content: '–';
+ line-height: 0.9em;
+ padding: 0 8px;
+ }
+ div.olControlZoomPanel .olControlZoomToMaxExtentItemInactive {
+ display: none;
+ }
#title, #tags, #shortdesc {
display: none;
}
Modified: sandbox/pinch/examples/mobile.js
===================================================================
--- sandbox/pinch/examples/mobile.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/examples/mobile.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -1,77 +1,40 @@
-
// initialize map when page ready
var map;
-var gg = new OpenLayers.Projection("EPSG:4326");
-var sm = new OpenLayers.Projection("EPSG:900913");
-function init() {
-
- // layer for drawn features
- var vector = new OpenLayers.Layer.Vector();
+// Get rid of address bar on iphone/ipod
+var fixSize = function() {
+ window.scrollTo(0,0);
+ document.body.style.height = '100%';
+ if (!(/(iphone|ipod)/.test(navigator.userAgent.toLowerCase()))) {
+ if (document.body.parentNode) {
+ document.body.parentNode.style.height = '100%';
+ }
+ }
+};
+setTimeout(fixSize, 700);
+setTimeout(fixSize, 1500);
+
+var init = function () {
// create map
map = new OpenLayers.Map({
div: "map",
- projection: sm,
- units: "m",
- numZoomLevels: 18,
- maxResolution: 156543.0339,
- maxExtent: new OpenLayers.Bounds(
- -20037508.34, -20037508.34, 20037508.34, 20037508.34
- ),
+ theme: null,
controls: [
+ new OpenLayers.Control.Attribution(),
new OpenLayers.Control.TouchNavigation({
dragPanOptions: {
- interval: 0, // non-zero kills performance on some mobile phones
+ interval: 100,
enableKinetic: true
}
}),
- new OpenLayers.Control.Attribution(),
- new OpenLayers.Control.DrawFeature(
- vector, OpenLayers.Handler.Point, {id: "point-control"}
- ),
- new OpenLayers.Control.DrawFeature(
- vector, OpenLayers.Handler.Path, {id: "line-control"}
- ),
- new OpenLayers.Control.DrawFeature(
- vector, OpenLayers.Handler.Polygon, {id: "poly-control"}
- ),
- new OpenLayers.Control.ModifyFeature(vector, {id: "mod-control"}),
new OpenLayers.Control.ZoomPanel()
],
- layers: [new OpenLayers.Layer.OSM(), vector],
- center: new OpenLayers.LonLat(0, 0),
- zoom: 1
+ layers: [
+ new OpenLayers.Layer.OSM("OpenStreetMap", null, {
+ transitionEffect: 'resize'
+ })
+ ],
+ center: new OpenLayers.LonLat(742000, 5861000),
+ zoom: 3
});
-
- // attempt to get position
- if (window.navigator && navigator.geolocation) {
- navigator.geolocation.getCurrentPosition(
- updatePosition,
- function failure(error) {
- OpenLayers.Console.log(error.message);
- },
- {
- enableHighAccuracy: true
- }
- );
- }
-
};
-
-// get position if possible
-var position;
-function updatePosition(pos) {
- position = pos;
- var lon = position.coords.longitude;
- var lat = position.coords.latitude;
- OpenLayers.Console.log("position: lon " + lon + ", lat " + lat);
- map.setCenter(
- new OpenLayers.LonLat(lon, lat).transform(gg, sm)
- );
-}
-
-function pan(fx, fy) {
- var size = map.getSize();
- map.pan(size.w * fx, size.h * fy);
-}
-
Modified: sandbox/pinch/examples/spherical-mercator.html
===================================================================
--- sandbox/pinch/examples/spherical-mercator.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/examples/spherical-mercator.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -24,107 +24,111 @@
<script src="../lib/OpenLayers.js"></script>
<script type="text/javascript">
- // make map available for easy debugging
- var map;
+// make map available for easy debugging
+var map;
- // increase reload attempts
- OpenLayers.IMAGE_RELOAD_ATTEMPTS = 3;
+// increase reload attempts
+OpenLayers.IMAGE_RELOAD_ATTEMPTS = 3;
- function init(){
- var options = {
- projection: new OpenLayers.Projection("EPSG:900913"),
- displayProjection: new OpenLayers.Projection("EPSG:4326"),
- units: "m",
- numZoomLevels: 18,
- maxResolution: 156543.0339,
- maxExtent: new OpenLayers.Bounds(-20037508, -20037508,
- 20037508, 20037508.34)
- };
- map = new OpenLayers.Map('map', options);
+function init(){
+ var maxExtent = new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508),
+ restrictedExtent = maxExtent.clone(-20037508, -20037508, 20037508, 20037508),
+ maxResolution = 156543.0339;
+
+ var options = {
+ projection: new OpenLayers.Projection("EPSG:900913"),
+ displayProjection: new OpenLayers.Projection("EPSG:4326"),
+ units: "m",
+ numZoomLevels: 18,
+ maxResolution: maxResolution,
+ maxExtent: maxExtent,
+ restrictedExtent: restrictedExtent
+ };
+ map = new OpenLayers.Map('map', options);
- // create Google Mercator layers
- var gmap = new OpenLayers.Layer.Google(
- "Google Streets",
- {'sphericalMercator': true}
- );
- var gsat = new OpenLayers.Layer.Google(
- "Google Satellite",
- {type: G_SATELLITE_MAP, 'sphericalMercator': true, numZoomLevels: 22}
- );
- var ghyb = new OpenLayers.Layer.Google(
- "Google Hybrid",
- {type: G_HYBRID_MAP, 'sphericalMercator': true}
- );
+ // create Google Mercator layers
+ var gmap = new OpenLayers.Layer.Google(
+ "Google Streets",
+ {sphericalMercator: true}
+ );
+ var gsat = new OpenLayers.Layer.Google(
+ "Google Satellite",
+ {type: G_SATELLITE_MAP, sphericalMercator: true, numZoomLevels: 22}
+ );
+ var ghyb = new OpenLayers.Layer.Google(
+ "Google Hybrid",
+ {type: G_HYBRID_MAP, sphericalMercator: true}
+ );
- // create Virtual Earth layers
- var veroad = new OpenLayers.Layer.VirtualEarth(
- "Virtual Earth Roads",
- {'type': VEMapStyle.Road, 'sphericalMercator': true}
- );
- var veaer = new OpenLayers.Layer.VirtualEarth(
- "Virtual Earth Aerial",
- {'type': VEMapStyle.Aerial, 'sphericalMercator': true}
- );
- var vehyb = new OpenLayers.Layer.VirtualEarth(
- "Virtual Earth Hybrid",
- {'type': VEMapStyle.Hybrid, 'sphericalMercator': true}
- );
+ // create Virtual Earth layers
+ var veroad = new OpenLayers.Layer.VirtualEarth(
+ "Virtual Earth Roads",
+ {'type': VEMapStyle.Road, sphericalMercator: true}
+ );
+ var veaer = new OpenLayers.Layer.VirtualEarth(
+ "Virtual Earth Aerial",
+ {'type': VEMapStyle.Aerial, sphericalMercator: true}
+ );
+ var vehyb = new OpenLayers.Layer.VirtualEarth(
+ "Virtual Earth Hybrid",
+ {'type': VEMapStyle.Hybrid, sphericalMercator: true}
+ );
- // create Yahoo layer
- var yahoo = new OpenLayers.Layer.Yahoo(
- "Yahoo Street",
- {'sphericalMercator': true}
- );
- var yahoosat = new OpenLayers.Layer.Yahoo(
- "Yahoo Satellite",
- {'type': YAHOO_MAP_SAT, 'sphericalMercator': true}
- );
- var yahoohyb = new OpenLayers.Layer.Yahoo(
- "Yahoo Hybrid",
- {'type': YAHOO_MAP_HYB, 'sphericalMercator': true}
- );
+ // create Yahoo layer
+ var yahoo = new OpenLayers.Layer.Yahoo(
+ "Yahoo Street",
+ {sphericalMercator: true}
+ );
+ var yahoosat = new OpenLayers.Layer.Yahoo(
+ "Yahoo Satellite",
+ {'type': YAHOO_MAP_SAT, sphericalMercator: true}
+ );
+ var yahoohyb = new OpenLayers.Layer.Yahoo(
+ "Yahoo Hybrid",
+ {'type': YAHOO_MAP_HYB, sphericalMercator: true}
+ );
- // create OSM layer
- var mapnik = new OpenLayers.Layer.OSM();
- // create OAM layer
- var oam = new OpenLayers.Layer.XYZ(
- "OpenAerialMap",
- "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/${z}/${x}/${y}.png",
- {
- sphericalMercator: true
- }
- );
+ // create OSM layer
+ var mapnik = new OpenLayers.Layer.OSM();
+ // create OAM layer
+ var oam = new OpenLayers.Layer.XYZ(
+ "OpenAerialMap",
+ "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/${z}/${x}/${y}.png",
+ {
+ sphericalMercator: true
+ }
+ );
- // create OSM layer
- var osmarender = new OpenLayers.Layer.OSM(
- "OpenStreetMap (Tiles at Home)",
- "http://tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png"
- );
+ // create OSM layer
+ var osmarender = new OpenLayers.Layer.OSM(
+ "OpenStreetMap (Tiles at Home)",
+ "http://tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png"
+ );
- // create WMS layer
- var wms = new OpenLayers.Layer.WMS(
- "World Map",
- "http://world.freemap.in/tiles/",
- {'layers': 'factbook-overlay', 'format':'png'},
- {
- 'opacity': 0.4, visibility: false,
- 'isBaseLayer': false,'wrapDateLine': true
- }
- );
+ // create WMS layer
+ var wms = new OpenLayers.Layer.WMS(
+ "World Map",
+ "http://world.freemap.in/tiles/",
+ {'layers': 'factbook-overlay', 'format':'png'},
+ {
+ 'opacity': 0.4, visibility: false,
+ 'isBaseLayer': false,'wrapDateLine': true
+ }
+ );
- // create a vector layer for drawing
- var vector = new OpenLayers.Layer.Vector("Editable Vectors");
+ // create a vector layer for drawing
+ var vector = new OpenLayers.Layer.Vector("Editable Vectors");
- map.addLayers([gmap, gsat, ghyb, veroad, veaer, vehyb,
- yahoo, yahoosat, yahoohyb, oam, mapnik, osmarender,
- wms, vector]);
- map.addControl(new OpenLayers.Control.LayerSwitcher());
- map.addControl(new OpenLayers.Control.EditingToolbar(vector));
- map.addControl(new OpenLayers.Control.Permalink());
- map.addControl(new OpenLayers.Control.MousePosition());
- if (!map.getCenter()) {map.zoomToMaxExtent()}
- }
+ map.addLayers([gmap, gsat, ghyb, veroad, veaer, vehyb,
+ yahoo, yahoosat, yahoohyb, oam, mapnik, osmarender,
+ wms, vector]);
+ map.addControl(new OpenLayers.Control.LayerSwitcher());
+ map.addControl(new OpenLayers.Control.EditingToolbar(vector));
+ map.addControl(new OpenLayers.Control.Permalink());
+ map.addControl(new OpenLayers.Control.MousePosition());
+ if (!map.getCenter()) {map.zoomToMaxExtent()}
+}
</script>
</head>
Modified: sandbox/pinch/examples/tile-origin.html
===================================================================
--- sandbox/pinch/examples/tile-origin.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/examples/tile-origin.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -5,7 +5,6 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<title>OpenLayers Tile Origin Example</title>
<link rel="stylesheet" href="../theme/default/style.css" type="text/css">
- <link rel="stylesheet" href="../theme/default/google.css" type="text/css">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body>
Modified: sandbox/pinch/img/cloud-popup-relative.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/drag-rectangle-off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/drag-rectangle-on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/east-mini.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/layer-switcher-maximize.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/layer-switcher-minimize.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/marker-blue.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/marker-gold.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/marker-green.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/marker.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/measuring-stick-off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/measuring-stick-on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/north-mini.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/panning-hand-off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/panning-hand-on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/slider.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/south-mini.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/west-mini.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/zoom-minus-mini.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/zoom-plus-mini.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/zoom-world-mini.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/img/zoombar.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/lib/OpenLayers/BaseTypes/Pixel.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/BaseTypes/Pixel.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/lib/OpenLayers/BaseTypes/Pixel.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -86,6 +86,24 @@
},
/**
+ * APIMethod: distanceTo
+ * Returns the distance to the pixel point passed in as a parameter.
+ *
+ * Parameters:
+ * px - {<OpenLayers.Pixel>}
+ *
+ * Returns:
+ * {Float} The pixel point passed in as parameter to calculate the
+ * distance to.
+ */
+ distanceTo:function(px) {
+ return Math.sqrt(
+ Math.pow(this.x - px.x, 2) +
+ Math.pow(this.y - px.y, 2)
+ );
+ },
+
+ /**
* APIMethod: add
*
* Parameters:
Modified: sandbox/pinch/lib/OpenLayers/Control/Geolocate.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/Control/Geolocate.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/lib/OpenLayers/Control/Geolocate.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -74,6 +74,14 @@
},
/**
+ * Method: destroy
+ */
+ destroy: function() {
+ this.deactivate();
+ OpenLayers.Control.prototype.destroy.apply(this, arguments);
+ },
+
+ /**
* Method: activate
* Activates the control.
*
Modified: sandbox/pinch/lib/OpenLayers/Control/MouseDefaults.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/Control/MouseDefaults.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/lib/OpenLayers/Control/MouseDefaults.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -165,7 +165,7 @@
this.zoomBox.style.opacity = "0.50";
this.zoomBox.style.fontSize = "1px";
this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
- this.map.viewPortDiv.appendChild(this.zoomBox);
+ this.map.eventsDiv.appendChild(this.zoomBox);
}
document.onselectstart = OpenLayers.Function.False;
OpenLayers.Event.stop(evt);
@@ -302,7 +302,7 @@
* Remove the zoombox from the screen and nullify our reference to it.
*/
removeZoomBox: function() {
- this.map.viewPortDiv.removeChild(this.zoomBox);
+ this.map.eventsDiv.removeChild(this.zoomBox);
this.zoomBox = null;
},
Modified: sandbox/pinch/lib/OpenLayers/Control/MouseToolbar.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/Control/MouseToolbar.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/lib/OpenLayers/Control/MouseToolbar.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -207,7 +207,7 @@
this.zoomBox.style.opacity = "0.50";
this.zoomBox.style.fontSize = "1px";
this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
- this.map.viewPortDiv.appendChild(this.zoomBox);
+ this.map.eventsDiv.appendChild(this.zoomBox);
this.performedDrag = true;
break;
case "measure":
Modified: sandbox/pinch/lib/OpenLayers/Control/OverviewMap.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/Control/OverviewMap.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/lib/OpenLayers/Control/OverviewMap.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -157,7 +157,7 @@
this.handlers.drag.destroy();
}
- this.ovmap && this.ovmap.viewPortDiv.removeChild(this.extentRectangle);
+ this.ovmap && this.ovmap.eventsDiv.removeChild(this.extentRectangle);
this.extentRectangle = null;
if (this.rectEvents) {
@@ -489,7 +489,7 @@
{controls: [], maxResolution: 'auto',
fallThrough: false}, this.mapOptions);
this.ovmap = new OpenLayers.Map(this.mapDiv, options);
- this.ovmap.viewPortDiv.appendChild(this.extentRectangle);
+ this.ovmap.eventsDiv.appendChild(this.extentRectangle);
// prevent ovmap from being destroyed when the page unloads, because
// the OverviewMap control has to do this (and does it).
Modified: sandbox/pinch/lib/OpenLayers/Handler/Box.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/Handler/Box.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/lib/OpenLayers/Handler/Box.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -96,10 +96,10 @@
new OpenLayers.Pixel(-9999, -9999));
this.zoomBox.className = this.boxDivClassName;
this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
- this.map.viewPortDiv.appendChild(this.zoomBox);
+ this.map.eventsDiv.appendChild(this.zoomBox);
OpenLayers.Element.addClass(
- this.map.viewPortDiv, "olDrawBox"
+ this.map.eventsDiv, "olDrawBox"
);
},
@@ -157,11 +157,11 @@
* Remove the zoombox from the screen and nullify our reference to it.
*/
removeBox: function() {
- this.map.viewPortDiv.removeChild(this.zoomBox);
+ this.map.eventsDiv.removeChild(this.zoomBox);
this.zoomBox = null;
this.boxCharacteristics = null;
OpenLayers.Element.removeClass(
- this.map.viewPortDiv, "olDrawBox"
+ this.map.eventsDiv, "olDrawBox"
);
},
Modified: sandbox/pinch/lib/OpenLayers/Handler/Click.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/Handler/Click.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/lib/OpenLayers/Handler/Click.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -85,24 +85,23 @@
/**
* Property: down
- * {<OpenLayers.Pixel>} The pixel location of the last mousedown.
+ * {Object} Object that store relevant information about the last
+ * mousedown or touchstart. Its 'xy' OpenLayers.Pixel property gives
+ * the average location of the mouse/touch event. Its 'touches'
+ * property records clientX/clientY of each touches.
*/
down: null,
/**
* Property: last
- * {<OpenLayers.Pixel>} The pixel for the last touchmove. This is
- * used to
+ * {Object} Object that store relevant information about the last
+ * touchmove. Its 'xy' OpenLayers.Pixel property gives
+ * the average location of the mouse/touch event. Its 'touches'
+ * property records clientX/clientY of each touches.
*/
last: null,
/**
- * Property: touch
- * {Boolean} Are we on a touch enabled device? Default is false.
- */
- touch: false,
-
- /**
* Property: rightclickTimerId
* {Number} The id of the right mouse timeout waiting to clear the
* <delayedEvent>.
@@ -130,7 +129,7 @@
// optionally register for mouseup and mousedown
if(this.pixelTolerance != null) {
this.mousedown = function(evt) {
- this.down = evt;
+ this.down = this.getEventInfo(evt);
return true;
};
}
@@ -154,8 +153,7 @@
* {Boolean} Continue propagating this event.
*/
touchstart: function(evt) {
- this.touch = true;
- this.down = evt;
+ this.down = this.getEventInfo(evt);
this.last = null;
return true;
},
@@ -244,8 +242,9 @@
dblclick: function(evt) {
// for touch devices trigger dblclick only for
// "one finger" touch
- if(this.passesTolerance(evt) &&
- (!evt.lastTouches || evt.lastTouches.length == 1)) {
+ var last = this.down || this.last;
+ if (this.passesTolerance(evt) &&
+ (!last || !last.touches || last.touches.length == 1)) {
if(this["double"]) {
this.callback('dblclick', [evt]);
}
@@ -260,7 +259,7 @@
* an empty "touches" property.
*/
touchmove: function(evt) {
- this.last = evt;
+ this.last = this.getEventInfo(evt);
},
/**
@@ -287,13 +286,14 @@
*/
click: function(evt) {
// Sencha Touch emulates click events, see ticket 3079 for more info
- if (this.touch === true && evt.type === "click") {
+ if (this.down && this.down.touches && evt.type === "click") {
return !this.stopSingle;
}
if(this.passesTolerance(evt)) {
if(this.timerId != null) {
// already received a click
- if(evt.lastTouches) {
+ var last = this.down || this.last;
+ if (last && last.touches && last.touches.length > 0) {
// touch device - we may trigger dblclick
this.dblclick(evt);
} else {
@@ -367,6 +367,35 @@
},
/**
+ * Method: getEventInfo
+ * This method allows us to store event information without storing the
+ * actual event. In touch devices (at least), the same event is
+ * modified between touchstart, touchmove, and touchend.
+ *
+ * Returns:
+ * {Object} An object with event related info.
+ */
+ getEventInfo: function(evt) {
+ var touches;
+ if (evt.touches) {
+ var len = evt.touches.length;
+ touches = new Array(len);
+ var touch;
+ for (var i=0; i<len; i++) {
+ touch = evt.touches[i];
+ touches[i] = {
+ clientX: touch.clientX,
+ clientY: touch.clientY
+ };
+ }
+ }
+ return {
+ xy: evt.xy,
+ touches: touches
+ };
+ },
+
+ /**
* APIMethod: deactivate
* Deactivate the handler.
*
Modified: sandbox/pinch/lib/OpenLayers/Layer/Grid.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/Layer/Grid.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/lib/OpenLayers/Layer/Grid.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -78,8 +78,11 @@
* {Integer} Used only when in gridded mode, this specifies the number of
* extra rows and colums of tiles on each side which will
* surround the minimum grid tiles to cover the map.
+ * For very slow loading layers, a larger value may increase
+ * performance somewhat when dragging, but will increase bandwidth
+ * use significantly.
*/
- buffer: 2,
+ buffer: 0,
/**
* APIProperty: numLoadingTiles
@@ -129,6 +132,20 @@
},
/**
+ * Method: removeMap
+ * Called when the layer is removed from the map.
+ *
+ * Parameters:
+ * map - {<OpenLayers.Map>} The map.
+ */
+ removeMap: function(map) {
+ if(this.timerId != null) {
+ window.clearTimeout(this.timerId);
+ this.timerId = null;
+ }
+ },
+
+ /**
* APIMethod: destroy
* Deconstruct the layer and clear the grid.
*/
Modified: sandbox/pinch/lib/OpenLayers/Layer/VirtualEarth.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/Layer/VirtualEarth.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/lib/OpenLayers/Layer/VirtualEarth.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -13,7 +13,11 @@
/**
* Class: OpenLayers.Layer.VirtualEarth
- *
+ * Instances of OpenLayers.Layer.VirtualEarth are used to display the data from
+ * the Bing Maps AJAX Control (see e.g.
+ * http://msdn.microsoft.com/library/bb429619.aspx). Create a VirtualEarth
+ * layer with the <OpenLayers.Layer.VirtualEarth> constructor.
+ *
* Inherits from:
* - <OpenLayers.Layer.EventPane>
* - <OpenLayers.Layer.FixedZoomLevels>
@@ -94,7 +98,23 @@
/**
* Constructor: OpenLayers.Layer.VirtualEarth
+ * Creates a new instance of a OpenLayers.Layer.VirtualEarth. If you use an
+ * instance of OpenLayers.Layer.VirtualEarth in you map, you should set
+ * the <OpenLayers.Map> option restrictedExtent to a meaningful value,
+ * e.g.:
+ * (code)
+ * var map = new OpenLayers.Map( 'map', {
+ * // other map options
+ * restrictedExtent : OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508)
+ * } );
*
+ * var veLayer = new OpenLayers.Layer.VirtualEarth (
+ * "Virtual Earth Layer"
+ * );
+ *
+ * map.addLayer( veLayer );
+ * (end)
+ *
* Parameters:
* name - {String}
* options - {Object}
Modified: sandbox/pinch/lib/OpenLayers/Map.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/Map.js 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/lib/OpenLayers/Map.js 2011-02-25 15:14:40 UTC (rev 11509)
@@ -600,6 +600,14 @@
// add any initial layers
if (options && options.layers) {
+ /**
+ * If you have set options.center, the map center property will be
+ * set at this point. However, since setCenter has not been caleld,
+ * addLayers gets confused. So we delete the map center in this
+ * case. Because the check below uses options.center, it will
+ * be properly set below.
+ */
+ delete this.center;
this.addLayers(options.layers);
// set center (and optionally zoom)
if (options.center) {
@@ -643,7 +651,15 @@
/**
* APIMethod: destroy
- * Destroy this map
+ * Destroy this map.
+ * Note that if you are using an application which removes a container
+ * of the map from the DOM, you need to ensure that you destroy the
+ * map *before* this happens; otherwise, the page unload handler
+ * will fail because the DOM elements that map.destroy() wants
+ * to clean up will be gone. (See
+ * http://trac.osgeo.org/openlayers/ticket/2277 for more information).
+ * This will apply to GeoExt and also to other applications which
+ * modify the DOM of the container of the OpenLayers Map.
*/
destroy:function() {
// if unloadDestroy is null, we've already been destroyed
Modified: sandbox/pinch/tests/BaseTypes/Pixel.html
===================================================================
--- sandbox/pinch/tests/BaseTypes/Pixel.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/BaseTypes/Pixel.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -40,11 +40,22 @@
t.eq( pixel.x, 5, "changing oldPixel.x doesn't change pixel.x");
}
+ function test_Pixel_distanceTo(t) {
+ t.plan( 2 );
+ var px = new OpenLayers.Pixel(0,-2);
+ pixel = new OpenLayers.Pixel(0,0);
+ t.eq( pixel.distanceTo(px), 2, "(0,0) distanceTo (0,-2) = 2");
+
+ px = new OpenLayers.Pixel(-4,6);
+ pixel = new OpenLayers.Pixel(4,6);
+ t.eq( pixel.distanceTo(px), 8, "(4,6) distanceTo (-4,6) = 8");
+ }
+
function test_Pixel_equals(t) {
t.plan( 5 );
pixel = new OpenLayers.Pixel(5,6);
- px = new OpenLayers.Pixel(5,6);
+ var px = new OpenLayers.Pixel(5,6);
t.eq( pixel.equals(px), true, "(5,6) equals (5,6)");
px = new OpenLayers.Pixel(1,6);
Modified: sandbox/pinch/tests/Control/Geolocate.html
===================================================================
--- sandbox/pinch/tests/Control/Geolocate.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Control/Geolocate.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../../lib/OpenLayers.js"></script>
+ <script src="../OLLoader.js"></script>
<script type="text/javascript">
var map, control, centerLL
watch = null,
@@ -113,6 +113,17 @@
map.addControl(control);
control.activate();
}
+ function test_destroy(t) {
+ t.plan(1);
+ var control = new OpenLayers.Control.Geolocate({
+ geolocation: geolocation,
+ watch: true
+ });
+ control.activate();
+ control.destroy();
+ t.ok(control.active === false, "control deactivated before being destroyed");
+ }
+
function loader() {
map = new OpenLayers.Map('map');
var layer = new OpenLayers.Layer.WMS("Test Layer",
Modified: sandbox/pinch/tests/Handler/Click.html
===================================================================
--- sandbox/pinch/tests/Handler/Click.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Handler/Click.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -316,14 +316,14 @@
log = null;
handler.touchstart({xy: {x: 1, y: 1}, touches: ["foo"]});
- handler.touchend({});
+ handler.touchend({touches: ["foo"]});
t.delay_call(1, function() {
t.ok(log != null, "click callback called");
if(log != null) {
t.eq(log.x, 1, "evt.xy.x as expected");
t.eq(log.y, 1, "evt.xy.y as expected");
- t.eq(log.lastTouches, ["foo"], "evt.lastTouches as expected");
+ t.ok(log.lastTouches, "evt.lastTouches as expected");
}
// tear down
map.destroy();
@@ -359,7 +359,7 @@
handler.touchstart({xy: {x: 1, y: 1}, touches: ["foo"]});
handler.touchend({type: "click"});
- t.eq(handler.touch, true, "Touch property should be true");
+ t.eq(!!handler.down.touches, true, "Handler down touches property should be truthy");
t.ok(log.dblclick == undefined, "dblclick callback not called with simulated click");
@@ -395,9 +395,9 @@
// test
log = {};
- handler.touchstart({xy: {x: 1, y: 1}, touches: ["foo"]});
+ handler.touchstart({xy: {x: 1, y: 1}, touches: [{clientX:0, clientY:10}]});
handler.touchend({});
- handler.touchstart({xy: {x: 1, y: 1}, touches: ["foo"]});
+ handler.touchstart({xy: {x: 1, y: 1}, touches: [{clientX:0, clientY:10}]});
handler.touchend({});
t.eq(log.click, undefined, "click callback not called");
@@ -405,7 +405,7 @@
if(log.dblclick != undefined) {
t.eq(log.dblclick.x, 1, "evt.xy.x as expected");
t.eq(log.dblclick.y, 1, "evt.xy.y as expected");
- t.eq(log.dblclick.lastTouches, ["foo"], "evt.lastTouches as expected");
+ t.ok(log.dblclick.lastTouches, "evt.lastTouches on evt");
}
// tear down
Modified: sandbox/pinch/tests/Layer/ArcGIS93Rest.html
===================================================================
--- sandbox/pinch/tests/Layer/ArcGIS93Rest.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Layer/ArcGIS93Rest.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -94,7 +94,7 @@
var params = {layers: "show:0,2"};
t.plan( 2 );
var map = new OpenLayers.Map('map');
- layer = new OpenLayers.Layer.ArcGIS93Rest(name, url, params);
+ layer = new OpenLayers.Layer.ArcGIS93Rest(name, url, params, {buffer: 2});
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);
t.eq( layer.grid.length, 7, "Grid rows is correct." );
Modified: sandbox/pinch/tests/Layer/Grid.html
===================================================================
--- sandbox/pinch/tests/Layer/Grid.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Layer/Grid.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -27,7 +27,7 @@
layer = new OpenLayers.Layer.Grid(name, url, params, null);
t.ok( layer instanceof OpenLayers.Layer.Grid, "returns OpenLayers.Layer.Grid object" );
- t.eq( layer.buffer, 2, "buffer default is 2");
+ t.eq( layer.buffer, 0, "buffer default is 0");
t.eq( layer.ratio, 1.5, "ratio default is 1.5");
t.eq( layer.numLoadingTiles, 0, "numLoadingTiles starts at 0");
t.ok( layer.events.listeners["tileloaded"] != null, "'tileloaded' event added to layer's event types");
@@ -47,7 +47,7 @@
function test_Layer_Grid_inittiles (t) {
t.plan( 2 );
var map = new OpenLayers.Map('map');
- layer = new OpenLayers.Layer.WMS(name, url, params);
+ layer = new OpenLayers.Layer.WMS(name, url, params, {buffer:2});
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);
t.eq( layer.grid.length, 7, "Grid rows is correct." );
@@ -593,7 +593,7 @@
function test_Layer_Grid_destroy (t) {
- t.plan( 7 );
+ t.plan( 8 );
var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.Grid(name, url, params);
@@ -608,6 +608,7 @@
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0), 10);
+ map.setCenter(new OpenLayers.LonLat(1,1));
//grab a reference to one of the tiles
@@ -616,6 +617,7 @@
layer.destroy();
t.eq( tile.imgDiv, null, "Tile destroyed" );
+ t.eq( layer.timerId, null, "Tile loading timeout cleared");
t.ok( layer.grid == null, "tiles appropriately destroyed")
Modified: sandbox/pinch/tests/Layer/KaMap.html
===================================================================
--- sandbox/pinch/tests/Layer/KaMap.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Layer/KaMap.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -65,8 +65,8 @@
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);
- t.eq( layer.grid.length, 8, "KaMap rows is correct." );
- t.eq( layer.grid[0].length, 6, "KaMap cols is correct." );
+ t.eq( layer.grid.length, 4, "KaMap rows is correct." );
+ t.eq( layer.grid[0].length, 3, "KaMap cols is correct." );
map.destroy();
}
Modified: sandbox/pinch/tests/Layer/MapGuide.html
===================================================================
--- sandbox/pinch/tests/Layer/MapGuide.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Layer/MapGuide.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -69,7 +69,7 @@
layer = new OpenLayers.Layer.MapGuide(name, url, paramsTiled);
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,400000),5);
- t.eq( layer.grid.length, 6, "Grid rows is correct." );
+ t.eq( layer.grid.length, 3, "Grid rows is correct." );
// t.eq( layer.grid[0].length, 6, "Grid cols is correct." );
map.destroy();
}
Modified: sandbox/pinch/tests/Layer/MapServer.html
===================================================================
--- sandbox/pinch/tests/Layer/MapServer.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Layer/MapServer.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -74,11 +74,11 @@
function test_Layer_MapServer_inittiles (t) {
t.plan( 2 );
var map = new OpenLayers.Map('map');
- layer = new OpenLayers.Layer.MapServer(name, url, params);
+ layer = new OpenLayers.Layer.MapServer(name, url, params, {buffer: 0});
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);
- t.eq( layer.grid.length, 7, "Grid rows is correct." );
- t.eq( layer.grid[0].length, 6, "Grid cols is correct." );
+ t.eq( layer.grid.length, 4, "Grid rows is correct." );
+ t.eq( layer.grid[0].length, 3, "Grid cols is correct." );
map.destroy();
}
@@ -234,7 +234,7 @@
var map = new OpenLayers.Map('map');
var layer = new OpenLayers.Layer.Google("Google");
map.addLayer(layer);
- layer = new OpenLayers.Layer.MapServer(name, url, params, {isBaseLayer: false, reproject: true});
+ layer = new OpenLayers.Layer.MapServer(name, url, params, {isBaseLayer: false, reproject: true, buffer: 2});
layer.isBaseLayer=false;
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0), 5);
@@ -251,7 +251,7 @@
}
var map = new OpenLayers.Map('map');
- layer = new OpenLayers.Layer.MapServer(name, url, params);
+ layer = new OpenLayers.Layer.MapServer(name, url, params, {buffer:2});
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0), 5);
var tile = layer.grid[0][0];
Modified: sandbox/pinch/tests/Layer/TMS.html
===================================================================
--- sandbox/pinch/tests/Layer/TMS.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Layer/TMS.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -134,7 +134,7 @@
t.plan(1);
m = new OpenLayers.Map("map", {'maxExtent':new OpenLayers.Bounds(-122.6579,37.4901,-122.0738,37.8795)});
layer = new OpenLayers.Layer.TMS( "TMS",
- "http://labs.metacarta.com/wms-c/Basic.py/", {layername: 'basic', type:'png', resolutions:[0.000634956337608418]} );
+ "http://labs.metacarta.com/wms-c/Basic.py/", {layername: 'basic', type:'png', resolutions:[0.000634956337608418], buffer: 2} );
m.addLayer(layer);
m.zoomToMaxExtent();
t.eq(layer.getURL(layer.grid[3][3].bounds), "http://labs.metacarta.com/wms-c/Basic.py/1.0.0/basic/0/1/1.png", "TMS tiles around rounded properly.");
Modified: sandbox/pinch/tests/Layer/WMS.html
===================================================================
--- sandbox/pinch/tests/Layer/WMS.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Layer/WMS.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -146,7 +146,7 @@
function test_Layer_WMS_inittiles (t) {
t.plan( 2 );
var map = new OpenLayers.Map('map');
- layer = new OpenLayers.Layer.WMS(name, url, params);
+ layer = new OpenLayers.Layer.WMS(name, url, params, {buffer:2});
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);
t.eq( layer.grid.length, 7, "Grid rows is correct." );
@@ -312,7 +312,7 @@
var layer = new OpenLayers.Layer.Google("Google");
map.addLayer(layer);
var wmslayer = new OpenLayers.Layer.WMS(name, url, params,
- {isBaseLayer: false, reproject:true});
+ {isBaseLayer: false, reproject:true, buffer: 2});
wmslayer.isBaseLayer=false;
map.addLayer(wmslayer);
map.setCenter(new OpenLayers.LonLat(0,0), 5);
@@ -329,7 +329,7 @@
}
var map = new OpenLayers.Map('map');
- layer = new OpenLayers.Layer.WMS(name, url, params);
+ layer = new OpenLayers.Layer.WMS(name, url, params, {buffer: 2});
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0), 5);
var tile = layer.grid[0][0];
Modified: sandbox/pinch/tests/Layer/WrapDateLine.html
===================================================================
--- sandbox/pinch/tests/Layer/WrapDateLine.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Layer/WrapDateLine.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -130,7 +130,7 @@
t.plan( 3 );
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
- layer = new OpenLayers.Layer.WMS(name, url, params, {'wrapDateLine':true,encodeBBOX:true});
+ layer = new OpenLayers.Layer.WMS(name, url, params, {'wrapDateLine':true,encodeBBOX:true, buffer: 2});
var m = new OpenLayers.Map('map');
m.addLayer(layer);
m.zoomToMaxExtent();
@@ -146,7 +146,7 @@
var layer = new OpenLayers.Layer.KaMap( "Blue Marble NG",
"http://www.openlayers.org/world/index.php",
{g: "satellite", map: "world"},
- {wrapDateLine: true} );
+ {wrapDateLine: true, buffer: 2} );
var m = new OpenLayers.Map('map');
m.addLayer(layer);
m.zoomToMaxExtent();
@@ -158,13 +158,13 @@
function test_Layer_WrapDateLine_WMS_Overlay (t) {
t.plan( 3 );
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
- baselayer = new OpenLayers.Layer.WMS(name, url, params, {'wrapDateLine':true});
+ baselayer = new OpenLayers.Layer.WMS(name, url, params, {'wrapDateLine':true, buffer: 2});
var layer = new OpenLayers.Layer.WMS( "DM Solutions Demo",
"http://www2.dmsolutions.ca/cgi-bin/mswms_gmap",
{layers: "bathymetry,land_fn,park,drain_fn,drainage," +
"prov_bound,fedlimit,rail,road,popplace",
transparent: "true", format: "image/png"},
- {wrapDateLine: true, reproject: false,encodeBBOX:true});
+ {wrapDateLine: true, reproject: false,encodeBBOX:true, buffer:2});
var m = new OpenLayers.Map('map');
m.addLayers([baselayer,layer]);
m.zoomToMaxExtent();
Modified: sandbox/pinch/tests/Layer/XYZ.html
===================================================================
--- sandbox/pinch/tests/Layer/XYZ.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Layer/XYZ.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -126,7 +126,7 @@
t.plan(1);
m = new OpenLayers.Map("map", {'maxExtent':new OpenLayers.Bounds(-122.6579,37.4901,-122.0738,37.8795)});
layer = new OpenLayers.Layer.XYZ( "XYZ",
- url, {layername: 'basic', type:'png', resolutions:[0.000634956337608418]} );
+ url, {layername: 'basic', type:'png', resolutions:[0.000634956337608418], buffer: 2} );
m.addLayer(layer);
m.zoomToMaxExtent()
t.eq(layer.getURL(layer.grid[3][3].bounds), "http://labs.metacarta.com/wms-c/Basic.py/1.0.0/basic/0/1/0.png", "XYZ tiles around rounded properly.");
Modified: sandbox/pinch/tests/Map.html
===================================================================
--- sandbox/pinch/tests/Map.html 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tests/Map.html 2011-02-25 15:14:40 UTC (rev 11509)
@@ -352,6 +352,8 @@
valid = OpenLayers.Map.prototype.isValidZoomLevel.apply(map, [19]);
t.eq(valid, false, "19 is not a valid zoomLevel when baseLayer has restrictedMinZoom of 1");
+
+ map.destroy();
}
function test_Map_isValidLonLat(t) {
@@ -977,6 +979,8 @@
map.addControls(controls2, pixels2);
t.eq(map.controls.length, 5, "three additional controls were added by map.addControls with a px-array");
t.eq(map.controls[3].position.toString(), pixels2[1].toString(), "control 'fourthctrl' has position set to given px");
+
+ map.destroy();
}
function test_Map_getControl(t) {
@@ -1598,11 +1602,13 @@
t.eq(map.layers.length, 2, "multiple layers added from options");
t.ok(map.baseLayer, "map has a base layer");
+
+ map.destroy();
}
function test_center_option(t) {
- t.plan(6);
+ t.plan(7);
var map, msg;
@@ -1625,6 +1631,12 @@
map.destroy();
}
+ var log = [];
+ var meth = OpenLayers.Layer.prototype.moveTo;
+ OpenLayers.Layer.prototype.moveTo = function() {
+ log.push(arguments);
+ meth.apply(this, arguments);
+ };
// set center without zoom
var center = new OpenLayers.LonLat(1, 2);
@@ -1635,8 +1647,10 @@
});
t.ok(center.equals(map.getCenter()), "map center set without zoom");
+ t.eq(log.length, 1, "moveTo called once");
map.destroy();
+ OpenLayers.Layer.prototype.moveTo = meth;
// set center and zoom
var zoom = 3;
Modified: sandbox/pinch/theme/default/img/add_point_off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/drag-rectangle-off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/drag-rectangle-on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/draw_line_off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/draw_line_on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/draw_point_off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/draw_point_on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/draw_polygon_off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/draw_polygon_on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/editing_tool_bar.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/move_feature_off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/move_feature_on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/navigation_history.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/pan-panel-NOALPHA.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/pan-panel.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/pan_on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/panning-hand-off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/panning-hand-on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/remove_point_on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/save_features_off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/save_features_on.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/view_next_off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/view_previous_off.png
===================================================================
(Binary files differ)
Modified: sandbox/pinch/theme/default/img/zoom-panel.png
===================================================================
(Binary files differ)
Property changes on: sandbox/pinch/tools
___________________________________________________________________
Modified: svn:ignore
- *.pyc
+ *.pyc
closure-compiler.jar
Copied: sandbox/pinch/tools/closure.py (from rev 11507, trunk/openlayers/tools/closure.py)
===================================================================
--- sandbox/pinch/tools/closure.py (rev 0)
+++ sandbox/pinch/tools/closure.py 2011-02-25 15:14:40 UTC (rev 11509)
@@ -0,0 +1,21 @@
+import sys
+import os
+import tempfile
+
+path = os.path.abspath(os.path.join(os.path.dirname(__file__), "closure-compiler.jar"))
+if not os.path.exists(path):
+ raise Exception("No closure-compiler.jar at %s; read README.txt!" % path)
+
+def minimize(code):
+ ntf = tempfile.NamedTemporaryFile()
+ ntf.write(code)
+ ntf.flush()
+
+ ntf2 = tempfile.NamedTemporaryFile()
+
+ os.system("java -jar %s --js %s --js_output_file %s" % (path, ntf.name, ntf2.name))
+ ntf2.seek(0)
+ data = ntf2.read()
+ ntf.close()
+ ntf2.close()
+ return data
Copied: sandbox/pinch/tools/closure_ws.py (from rev 11507, trunk/openlayers/tools/closure_ws.py)
===================================================================
--- sandbox/pinch/tools/closure_ws.py (rev 0)
+++ sandbox/pinch/tools/closure_ws.py 2011-02-25 15:14:40 UTC (rev 11509)
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+import httplib, urllib, sys
+import time
+# Define the parameters for the POST request and encode them in
+# a URL-safe format.
+
+def minimize(code):
+
+ params = urllib.urlencode([
+ ('js_code', code),
+ ('compilation_level', 'SIMPLE_OPTIMIZATIONS'),
+ ('output_format', 'text'),
+ ('output_info', 'compiled_code'),
+ ])
+
+ t = time.time()
+ # Always use the following value for the Content-type header.
+ headers = { "Content-type": "application/x-www-form-urlencoded" }
+ conn = httplib.HTTPConnection('closure-compiler.appspot.com')
+ conn.request('POST', '/compile', params, headers)
+ response = conn.getresponse()
+ data = response.read()
+ conn.close()
+ if data.startswith("Error"):
+ raise Exception(data)
+ print "%.3f seconds to compile" % (time.time() - t)
+ return data
Modified: sandbox/pinch/tools/release.sh
===================================================================
--- sandbox/pinch/tools/release.sh 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tools/release.sh 2011-02-25 15:14:40 UTC (rev 11509)
@@ -2,13 +2,22 @@
VERSION=$1
+wget -c http://closure-compiler.googlecode.com/files/compiler-latest.zip
+unzip compiler-latest.zip
+
svn export http://svn.openlayers.org/tags/openlayers/release-$VERSION OpenLayers-$VERSION
cd OpenLayers-$VERSION/build
-./build.py full
+mv ../../compiler.jar ../tools/closure-compiler.jar
+./build.py -c closure full
cp OpenLayers.js ..
+rm ../tools/closure-compiler.jar
cd ..
+for i in google ie6-style style; do
+ csstidy theme/default/$i.css --template=highest theme/default/$i.tidy.css
+done
+
mkdir doc/devdocs
mkdir doc/apidocs
rm tools/*.pyc
Modified: sandbox/pinch/tools/update_dev_dir.sh
===================================================================
--- sandbox/pinch/tools/update_dev_dir.sh 2011-02-25 15:13:53 UTC (rev 11508)
+++ sandbox/pinch/tools/update_dev_dir.sh 2011-02-25 15:14:40 UTC (rev 11509)
@@ -18,11 +18,15 @@
cd /osgeo/openlayers/docs/dev/tools/
python exampleparser.py
cd /osgeo/openlayers/docs/dev/build
- ./build.py tests.cfg
+ ./build.py -c closure tests.cfg
cp OpenLayers.js ..
cd ..
-
+ for i in google ie6-style style; do
+ csstidy theme/default/$i.css --template=highest theme/default/$i.tidy.css
+ cp theme/default/$i.tidy.css theme/default/$i.css
+ done
+
sed -i -e 's!../lib/OpenLayers.js!../OpenLayers.js!' examples/*.html
naturaldocs -i /osgeo/openlayers/docs/dev/lib -o HTML /osgeo/openlayers/dev/apidocs -p /osgeo/openlayers/docs/dev/apidoc_config -s Default OL >/dev/null
naturaldocs -i /osgeo/openlayers/docs/dev/lib -o HTML /osgeo/openlayers/dev/docs -p /osgeo/openlayers/docs/dev/doc_config -s Default OL >/dev/null
More information about the Commits
mailing list