[SCM] routino branch, master, updated. c536f3233aea5514875fdcd12b7c61a0cb2e2f92

[Uwe Steinmann]

The following commit has been merged in the master branch:
commit c536f3233aea5514875fdcd12b7c61a0cb2e2f92
Author: Uwe Steinmann <steinm at debian.org>
Date:   Wed Mar 7 11:54:46 2012 +0100

    - readded patch for map bounds, now applied to mapprops.js

diff --git a/debian/patches/map_bounds b/debian/patches/map_bounds
index 3fbbbcc..7ebea94 100644
--- a/debian/patches/map_bounds
+++ b/debian/patches/map_bounds
@@ -1,45 +1,26 @@
 Description: Enlarge bounds of visible map to world
 Author: Uwe Steinmann <steinm at debian.org>
 
---- routino-2.1.1.orig/web/www/routino/router.js
-+++ routino-2.1.1/web/www/routino/router.js
-@@ -458,12 +458,12 @@ function map_init(lat,lon,zoom)
+--- a/web/www/routino/mapprops.js
++++ b/web/www/routino/mapprops.js
+@@ -11,14 +11,14 @@
  
   // EDIT THIS below to change the visible map limits
  
-- var westedge  = -11.0;          // Minimum longitude (degrees)
-- var eastedge  =   2.0;          // Maximum longitude (degrees)
-- var southedge =  49.5;          // Minimum latitude (degrees)
-- var northedge =  61.0;          // Maximum latitude (degrees)
-- var zoomout   =     4;          // Minimum zoom
-- var zoomin    =    15;          // Maximum zoom
-+ var westedge  = -180.0;          // Minimum longitude (degrees)
-+ var eastedge  = +180.0;          // Maximum longitude (degrees)
-+ var southedge =  -80.0;          // Minimum latitude (degrees)
-+ var northedge =  +80.0;          // Maximum latitude (degrees)
-+ var zoomout   =      2;          // Minimum zoom
-+ var zoomin    =     16;          // Maximum zoom
+-    westedge:  -11.0,          // Minimum longitude (degrees)
+-    eastedge:    2.0,          // Maximum longitude (degrees)
++    westedge: -180.0,          // Minimum longitude (degrees)
++    eastedge: +180.0,          // Maximum longitude (degrees)
  
-  // EDIT THIS above to change the visible map limits
- 
---- a/web/www/routino/visualiser.js
-+++ b/web/www/routino/visualiser.js
-@@ -98,12 +98,12 @@
- 
-  // EDIT THIS below to change the visible map limits
+-    southedge:  49.5,          // Minimum latitude (degrees)
+-    northedge:  61.0,          // Maximum latitude (degrees)
++    southedge: -80.0,          // Minimum latitude (degrees)
++    northedge: +80.0,          // Maximum latitude (degrees)
  
-- var westedge  = -11.0;          // Minimum longitude (degrees)
-- var eastedge  =   2.0;          // Maximum longitude (degrees)
-- var southedge =  49.5;          // Minimum latitude (degrees)
-- var northedge =  61.0;          // Maximum latitude (degrees)
-- var zoomout   =     4;          // Minimum zoom
-- var zoomin    =    15;          // Maximum zoom
-+ var westedge  = -180.0;          // Minimum longitude (degrees)
-+ var eastedge  =  180.0;          // Maximum longitude (degrees)
-+ var southedge =  -80.5;          // Minimum latitude (degrees)
-+ var northedge =   80.0;          // Maximum latitude (degrees)
-+ var zoomout   =      2;          // Minimum zoom
-+ var zoomin    =     16;          // Maximum zoom
+-    zoomout:       4,          // Minimum zoom
+-    zoomin:       15,          // Maximum zoom
++    zoomout:       2,          // Minimum zoom
++    zoomin:       16,          // Maximum zoom
  
   // EDIT THIS above to change the visible map limits
  
diff --git a/debian/patches/series b/debian/patches/series
index 6de3845..0b10a16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@ install_path
 rename_router
 fix_tests
 use_openlayers
+map_bounds
 install_documentation

-- 
Packaging for routino