Merge remote-tracking branch 'upstream/master'

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index a38ee1bc2a22102384cb8d8df5d151c996610332..ba41b9315214428b83c3de1f5b38a325c736a321 100644 (file)
--- 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 75084c86d8c4c6c0d3909109582c681502dd99c1..01647d9197a594878f1ebdcfc711d41ab3095895 100644 (file)
--- 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,