From: Sarah Hoffmann Date: Sat, 26 Jan 2013 20:04:48 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~644 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/921cc233890705d6a916fa415b51fdd88fa8fe11?hp=5502c223756ed755edae9670497f1456e528d3f0 Merge remote-tracking branch 'upstream/master' --- diff --git a/lib/template/details-html.php b/lib/template/details-html.php index a38ee1bc..ba41b931 100644 --- a/lib/template/details-html.php +++ b/lib/template/details-html.php @@ -19,9 +19,6 @@ new OpenLayers.Control.Navigation(), new OpenLayers.Control.PanZoomBar(), new OpenLayers.Control.MousePosition(), - new OpenLayers.Control.TouchNavigation({ - dragPanOptions: { enableKinetic: true } - }), new OpenLayers.Control.Attribution()], maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), maxResolution: 156543.0399, diff --git a/lib/template/search-html.php b/lib/template/search-html.php index 75084c86..01647d91 100644 --- a/lib/template/search-html.php +++ b/lib/template/search-html.php @@ -112,10 +112,6 @@ new OpenLayers.Control.Navigation(), new OpenLayers.Control.PanZoomBar(), new OpenLayers.Control.MousePosition(), - new OpenLayers.Control.TouchNavigation({ - dragPanOptions: { enableKinetic: true } - }), - new OpenLayers.Control.Attribution()], maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), maxResolution: 156543.0399,