[hamradio-commits] [xastir] 01/03: Updates to OSM maps
Iain Learmonth
irl-guest at moszumanska.debian.org
Fri Apr 3 00:56:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
irl-guest pushed a commit to branch master
in repository xastir.
commit d33174e219b4734946a44258892374328b99fe2b
Author: Iain R. Learmonth <irl at fsfe.org>
Date: Fri Apr 3 00:33:20 2015 +0100
Updates to OSM maps
---
debian/changelog | 2 +
debian/patches/OSM_config.patch | 514 +++++++++-------------------------------
2 files changed, 119 insertions(+), 397 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d90b59a..46b351f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xastir (2.0.6-2) UNRELEASED; urgency=medium
* Fixed build dependency issues for festival.
* Fixed the use of dh_autoreconf.
* Added a desktop file.
+ * OSM_config.patch updated to the latest OSM .geo files from the upstream
+ CVS and now removes the non-functioning online maps too.
* debian/control:
- Fixed formatting with cme.
- Add automake as explicit build dependency.
diff --git a/debian/patches/OSM_config.patch b/debian/patches/OSM_config.patch
index 53bd46a..c6cb697 100644
--- a/debian/patches/OSM_config.patch
+++ b/debian/patches/OSM_config.patch
@@ -1,225 +1,107 @@
-Description: Upstream changes introduced in version 2.0.0-1
- Update entries to support additional OSM map types.
+Description: Upstream changes to maps introduced for 2.0.7.
+ Update entries to support additional OSM map types and remove old
+ non-functioning maps.
Origin: upstream
+
+--- xastir.orig/CanadaTopo250k.geo
++++ /dev/null
+@@ -1,2 +0,0 @@
+-TOPORAMA-250k
+-
+--- xastir.orig/CanadaTopo50k.geo
++++ /dev/null
+@@ -1,2 +0,0 @@
+-TOPORAMA-50k
+-
+--- xastir.orig/TXRadar.geo
++++ /dev/null
+@@ -1,23 +0,0 @@
+-#
+-# $Id: TXRadar.geo,v 1.1 2004/10/05 15:54:25 we7u Exp $
+-#
+-#US Composite Radar image (Unidata/LDM/Gempak) n5jxs 2003 08 25
+-URL http://mesonet.tamu.edu/gemdata/images/radar/01_mesonet.png
+-# X Y Long Lat
+-TIEPOINT 200 200 -104.80000 35.50000
+-TIEPOINT 1130 1090 -95.50000 26.60000
+-# Image extents: Lat: 24.6N to 37.5N, Lon: 93.5W to 106.8W (-93.5 to -106.8) # Image size extents: X: 1330 pixels, Y: 1290 pixels (.01 deg/pixel)
+-IMAGESIZE 1330 1290
+-#
+-# REFRESH tells your program just how often to retrieve the radar
+-# image. Images are recreated on the server every 6 minutes (720 sec).
+-REFRESH 720
+-# Transparent tells the program and image handling software what color
+-#is to be considered transparent. In this case, it's white and valid
+-# for a 24-bit color map.
+-#TRANSPARENT 0xffffff
+-# The following should work for a 16-bit color map.
+-#TRANSPARENT 0x0ffff
+-# The following should work for all color maps, now.
+-TRANSPARENT 0x0ffffffff
+-
+--- xastir.orig/USRadar.geo
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#
+-# $Id: USRadar.geo,v 1.5 2006/12/01 21:47:11 we7u Exp $
+-#
+-#US Composite Radar image (Unidata/LDM/Gempak) n5jxs 2003 08 25
+-# Modified for accuracy, comments: n5jxs 2004 03 15 1400UTC
+-#
+-# If you want to get a different image-type, change the selection
+-# below by removing the '#' from the front of the URL, and placing
+-# a '#' before all URLs for image-types you don't want.
+-# I don't know what will happen if you have multiple URLs selected.
+-URL http://mesonet.tamu.edu/gemdata/images/radar/01_USrad.png
+-#URL http://mesonet.tamu.edu/gemdata/images/radar/01_USrad.gif
+-#URL http://mesonet.tamu.edu/gemdata/images/radar/01_USrad.jpg
+-#URL http://mesonet.tamu.edu/gemdata/images/radar/01_USrad.tif
+-#
+-#
+-# X Y Long Lat
+-TIEPOINT 200 200 -123.00000 48.00000
+-TIEPOINT 5999 2499 -65.00000 23.00000
+-# Image extents: Lat: 23.0N to 50.0N, Lon: 65.0W to 125.0W (-65.0 to -125.0)
+-# Image size extents: X: 6000 pixels, Y: 2650 pixels (.01 deg/pixel)
+-IMAGESIZE 6000 2500
+-#
+-# REFRESH tells your program just how often to retrieve the radar
+-# image. Images are recreated on the server every 6 minutes (720
+-# sec).
+-REFRESH 720
+-# Transparent tells the program and image handling software what
+-# color is to be considered transparent. In this case, it's white
+-# and valid for a 24-bit color map.
+-#TRANSPARENT 0xffffff
+-# The following should work for a 16-bit color map.
+-#TRANSPARENT 0x0ffff
+-# The following should work for all color maps, now.
+-#TRANSPARENT 0x0ffffffff
+-TRANSPARENT 0x000000000
+-
+--- xastir.orig/WMSRadar.geo
++++ /dev/null
+@@ -1,17 +0,0 @@
+-WMSSERVER
+-#URL http://mesonet.tamu.edu/cgi-bin/CONUSradar?SERVICE=WMS&LAYERS=radar,nwscounties
+-URL http://mesonet.tamu.edu/cgi-bin/CONUSradar?SERVICE=WMS&LAYERS=radar&FORMAT=image/png&TRANSPARENT=TRUE&CRS=CRS:84&BGCOLOR=0x000000&VERSION=1.1.0
+-#
+-#
+-# REFRESH tells your program just how often to retrieve the radar
+-# image. Images are recreated on the server every 6 minutes (720
+-# sec).
+-REFRESH 720
+-#
+-#
+-# Black
+-TRANSPARENT 0x010101
+-TRANSPARENT 0x000000
+-# White
+-TRANSPARENT 0xffffff
+-
--- /dev/null
-+++ xastir-2.0.0/OSM_tiled_osmarender.geo
-@@ -0,0 +1,51 @@
-+#
-+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
-+#
-+#
-+# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
-+# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
-+#
-+# The string following OSMSTATICMAP-, is appended to the URL
-+# The string is typically expected to select a layer, and possibly style
-+# options. If not set it defaults to:
-+# layer=osmarander
-+#
-+# The string following OSM_TILED_MAP-, is the name of a sub-directory in
-+# the tile cache. It can be empty (delete the '-' too), though that is a
-+# bad idea if multiple map styles are using the same TILE_DIR.
-+#
-+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
-+#
-+#
-+#OSMSTATICMAP-osmarender
-+# or
-+OSM_TILED_MAP-osmarender
-+#
-+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
-+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+URL http://tah.openstreetmap.org/Tiles/tile/
-+
-+# Tile extension defaults to png
-+#TILE_EXT png
-+
-+#ZOOM_LEVEL_MIN 0
-+#ZOOM_LEVEL_MAX 18
-+
-+# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
-+# setting the following variable. If path does not begin with a '/' then
-+# it will be relative to ~/.xastir/.
-+#
-+#TILE_DIR OSMtiles
-+
-+
-+# When defined:
-+# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
-+# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
-+# and OSM zoom level, but only for debug level 512 (-v 512)
-+#
-+# The values are X KeySym values.
-+# 65473 = F4
-+# 65474 = F5
-+OSM_OPTIMIZE_KEY 65473
-+OSM_REPORT_SCALE_KEY 65474
-+
---- /dev/null
-+++ xastir-2.0.0/OSM_tiled_topOSM_0_relief.geo
-@@ -0,0 +1,51 @@
-+#
-+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
-+#
-+#
-+# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
-+# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
-+#
-+# The string following OSMSTATICMAP-, is appended to the URL
-+# The string is typically expected to select a layer, and possibly style
-+# options. If not set it defaults to:
-+# layer=osmarander
-+#
-+# The string following OSM_TILED_MAP-, is the name of a sub-directory in
-+# the tile cache. It can be empty (delete the '-' too), though that is a
-+# bad idea if multiple map styles are using the same TILE_DIR.
-+#
-+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
-+#
-+#
-+#OSMSTATICMAP-topOSMr
-+# or
-+OSM_TILED_MAP-topOSMr
-+#
-+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
-+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+URL http://tile1.toposm.com/usw/color-relief/
-+
-+# Tile extension defaults to png
-+TILE_EXT jpg
-+
-+ZOOM_LEVEL_MIN 5
-+ZOOM_LEVEL_MAX 15
-+
-+# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
-+# setting the following variable. If path does not begin with a '/' then
-+# it will be relative to ~/.xastir/.
-+#
-+#TILE_DIR OSMtiles
-+
-+
-+# When defined:
-+# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
-+# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
-+# and OSM zoom level, but only for debug level 512 (-v 512)
-+#
-+# The values are X KeySym values.
-+# 65473 = F4
-+# 65474 = F5
-+OSM_OPTIMIZE_KEY 65473
-+OSM_REPORT_SCALE_KEY 65474
-+
---- /dev/null
-+++ xastir-2.0.0/OSM_tiled_topOSM_2_features.geo
-@@ -0,0 +1,51 @@
-+#
-+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
-+#
-+#
-+# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
-+# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
-+#
-+# The string following OSMSTATICMAP-, is appended to the URL
-+# The string is typically expected to select a layer, and possibly style
-+# options. If not set it defaults to:
-+# layer=osmarander
-+#
-+# The string following OSM_TILED_MAP-, is the name of a sub-directory in
-+# the tile cache. It can be empty (delete the '-' too), though that is a
-+# bad idea if multiple map styles are using the same TILE_DIR.
-+#
-+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
-+#
-+#
-+#OSMSTATICMAP-topOSMf
-+# or
-+OSM_TILED_MAP-topOSMf
-+#
-+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
-+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+URL http://tile1.toposm.com/usw/features/
-+
-+# Tile extension defaults to png
-+#TILE_EXT png
-+
-+ZOOM_LEVEL_MIN 5
-+ZOOM_LEVEL_MAX 15
-+
-+# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
-+# setting the following variable. If path does not begin with a '/' then
-+# it will be relative to ~/.xastir/.
-+#
-+#TILE_DIR OSMtiles
-+
-+
-+# When defined:
-+# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
-+# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
-+# and OSM zoom level, but only for debug level 512 (-v 512)
-+#
-+# The values are X KeySym values.
-+# 65473 = F4
-+# 65474 = F5
-+OSM_OPTIMIZE_KEY 65473
-+OSM_REPORT_SCALE_KEY 65474
-+
---- /dev/null
-+++ xastir-2.0.0/OSM_cloudmade_1.geo
-@@ -0,0 +1,51 @@
-+#
-+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
-+#
-+#
-+# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
-+# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
-+#
-+# The string following OSMSTATICMAP-, is appended to the URL
-+# The string is typically expected to select a layer, and possibly style
-+# options. If not set it defaults to:
-+# layer=osmarander
-+#
-+# The string following OSM_TILED_MAP-, is the name of a sub-directory in
-+# the tile cache. It can be empty (delete the '-' too), though that is a
-+# bad idea if multiple map styles are using the same TILE_DIR.
-+#
-+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
-+#
-+#
-+OSMSTATICMAP-layer=cloudmade_1
-+# or
-+#OSM_TILED_MAP-layer=cloudmade_1
-+#
-+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
-+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+#URL tileURL
-+
-+# Tile extension defaults to png
-+#TILE_EXT png
-+
-+#ZOOM_LEVEL_MIN 0
-+#ZOOM_LEVEL_MAX 18
-+
-+# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
-+# setting the following variable. If path does not begin with a '/' then
-+# it will be relative to ~/.xastir/.
-+#
-+#TILE_DIR OSMtiles
-+
-+
-+# When defined:
-+# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
-+# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
-+# and OSM zoom level, but only for debug level 512 (-v 512)
-+#
-+# The values are X KeySym values.
-+# 65473 = F4
-+# 65474 = F5
-+OSM_OPTIMIZE_KEY 65473
-+OSM_REPORT_SCALE_KEY 65474
-+
---- /dev/null
-+++ xastir-2.0.0/OSM_cloudmade_5.geo
++++ xastir/OSM_tiled_cycle.geo
@@ -0,0 +1,51 @@
+#
+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
@@ -240,13 +122,13 @@ Origin: upstream
+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
+#
+#
-+OSMSTATICMAP-layer=cloudmade_5
++#OSMSTATICMAP-cycle
+# or
-+#OSM_TILED_MAP-layer=cloudmade_5
++OSM_TILED_MAP-cycle
+#
+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+#URL tileURL
++URL http://tile.opencyclemap.org/cycle/
+
+# Tile extension defaults to png
+#TILE_EXT png
@@ -273,7 +155,7 @@ Origin: upstream
+OSM_REPORT_SCALE_KEY 65474
+
--- /dev/null
-+++ xastir-2.0.0/OSM_cloudmade_998.geo
++++ xastir/OSM_tiled_fosm.geo
@@ -0,0 +1,51 @@
+#
+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
@@ -294,13 +176,13 @@ Origin: upstream
+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
+#
+#
-+OSMSTATICMAP-layer=cloudmade_998
++#OSMSTATICMAP-fosm
+# or
-+#OSM_TILED_MAP-layer=cloudmade_998
++OSM_TILED_MAP-fosm
+#
+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+#URL tileURL
++URL http://map.fosm.org/default/
+
+# Tile extension defaults to png
+#TILE_EXT png
@@ -327,7 +209,7 @@ Origin: upstream
+OSM_REPORT_SCALE_KEY 65474
+
--- /dev/null
-+++ xastir-2.0.0/OSM_tiled_mapnik.geo
++++ xastir/OSM_tiled_mapnik.geo
@@ -0,0 +1,51 @@
+#
+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
@@ -381,115 +263,7 @@ Origin: upstream
+OSM_REPORT_SCALE_KEY 65474
+
--- /dev/null
-+++ xastir-2.0.0/OSM_tiled_topOSM_1_contour.geo
-@@ -0,0 +1,51 @@
-+#
-+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
-+#
-+#
-+# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
-+# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
-+#
-+# The string following OSMSTATICMAP-, is appended to the URL
-+# The string is typically expected to select a layer, and possibly style
-+# options. If not set it defaults to:
-+# layer=osmarander
-+#
-+# The string following OSM_TILED_MAP-, is the name of a sub-directory in
-+# the tile cache. It can be empty (delete the '-' too), though that is a
-+# bad idea if multiple map styles are using the same TILE_DIR.
-+#
-+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
-+#
-+#
-+#OSMSTATICMAP-topOSMc
-+# or
-+OSM_TILED_MAP-topOSMc
-+#
-+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
-+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+URL http://tile1.toposm.com/usw/contours/
-+
-+# Tile extension defaults to png
-+#TILE_EXT png
-+
-+ZOOM_LEVEL_MIN 5
-+ZOOM_LEVEL_MAX 15
-+
-+# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
-+# setting the following variable. If path does not begin with a '/' then
-+# it will be relative to ~/.xastir/.
-+#
-+#TILE_DIR OSMtiles
-+
-+
-+# When defined:
-+# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
-+# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
-+# and OSM zoom level, but only for debug level 512 (-v 512)
-+#
-+# The values are X KeySym values.
-+# 65473 = F4
-+# 65474 = F5
-+OSM_OPTIMIZE_KEY 65473
-+OSM_REPORT_SCALE_KEY 65474
-+
---- /dev/null
-+++ xastir-2.0.0/OSM_tiled_skiing.geo
-@@ -0,0 +1,51 @@
-+#
-+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
-+#
-+#
-+# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
-+# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
-+#
-+# The string following OSMSTATICMAP-, is appended to the URL
-+# The string is typically expected to select a layer, and possibly style
-+# options. If not set it defaults to:
-+# layer=osmarander
-+#
-+# The string following OSM_TILED_MAP-, is the name of a sub-directory in
-+# the tile cache. It can be empty (delete the '-' too), though that is a
-+# bad idea if multiple map styles are using the same TILE_DIR.
-+#
-+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
-+#
-+#
-+#OSMSTATICMAP-skiing
-+# or
-+OSM_TILED_MAP-skiing
-+#
-+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
-+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+URL http://tiles.openpistemap.org/contours/
-+
-+# Tile extension defaults to png
-+#TILE_EXT png
-+
-+#ZOOM_LEVEL_MIN 0
-+#ZOOM_LEVEL_MAX 18
-+
-+# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
-+# setting the following variable. If path does not begin with a '/' then
-+# it will be relative to ~/.xastir/.
-+#
-+#TILE_DIR OSMtiles
-+
-+
-+# When defined:
-+# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
-+# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
-+# and OSM zoom level, but only for debug level 512 (-v 512)
-+#
-+# The values are X KeySym values.
-+# 65473 = F4
-+# 65474 = F5
-+OSM_OPTIMIZE_KEY 65473
-+OSM_REPORT_SCALE_KEY 65474
-+
---- /dev/null
-+++ xastir-2.0.0/OSM_cloudmade_999.geo
++++ xastir/OSM_tiled_mapquest-aerial.geo
@@ -0,0 +1,51 @@
+#
+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
@@ -510,13 +284,13 @@ Origin: upstream
+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
+#
+#
-+#OSMSTATICMAP-layer=cloudmade_999
++#OSMSTATICMAP-mapquest-aerial
+# or
-+#OSM_TILED_MAP-layer=cloudmade_999
++OSM_TILED_MAP-mapquest-aerial
+#
+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+#URL tileURL
++URL http://otile3.mqcdn.com/tiles/1.0.0/sat/
+
+# Tile extension defaults to png
+#TILE_EXT png
@@ -543,7 +317,7 @@ Origin: upstream
+OSM_REPORT_SCALE_KEY 65474
+
--- /dev/null
-+++ xastir-2.0.0/OSM_cloudmade_2.geo
++++ xastir/OSM_tiled_mapquest.geo
@@ -0,0 +1,51 @@
+#
+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
@@ -564,67 +338,13 @@ Origin: upstream
+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
+#
+#
-+OSMSTATICMAP-layer=cloudmade_2
++#OSMSTATICMAP-mapquest
+# or
-+#OSM_TILED_MAP-layer=cloudmade_2
-+#
-+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
-+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+#URL tileURL
-+
-+# Tile extension defaults to png
-+#TILE_EXT png
-+
-+#ZOOM_LEVEL_MIN 0
-+#ZOOM_LEVEL_MAX 18
-+
-+# The tile cache can be changed from the default (~/.xastir/OSMtiles) by
-+# setting the following variable. If path does not begin with a '/' then
-+# it will be relative to ~/.xastir/.
-+#
-+#TILE_DIR OSMtiles
-+
-+
-+# When defined:
-+# OSM_OPTIMIZE_KEY will change the map scaling to the nearest OSM zoom level.
-+# OSM_REPORT_SCALE_KEY will report the present, scale_x, scale_y,
-+# and OSM zoom level, but only for debug level 512 (-v 512)
-+#
-+# The values are X KeySym values.
-+# 65473 = F4
-+# 65474 = F5
-+OSM_OPTIMIZE_KEY 65473
-+OSM_REPORT_SCALE_KEY 65474
-+
---- /dev/null
-+++ xastir-2.0.0/OSM_tiled_cycle.geo
-@@ -0,0 +1,51 @@
-+#
-+# $Id: OSM_template,v 1.3 2010/08/14 21:32:43 jedunmire Exp $
-+#
-+#
-+# Map data Copyright OpenStreetMap Contributors, CC-BY-SA
-+# See www.openstreetmap.org and http://creativecommons.org/licenses/by-sa/2.0/
-+#
-+# The string following OSMSTATICMAP-, is appended to the URL
-+# The string is typically expected to select a layer, and possibly style
-+# options. If not set it defaults to:
-+# layer=osmarander
-+#
-+# The string following OSM_TILED_MAP-, is the name of a sub-directory in
-+# the tile cache. It can be empty (delete the '-' too), though that is a
-+# bad idea if multiple map styles are using the same TILE_DIR.
-+#
-+# Select only one of the two map types: OSMSTATICMAP or OSM_TILED_MAP
-+#
-+#
-+#OSMSTATICMAP-cycle
-+# or
-+OSM_TILED_MAP-cycle
++OSM_TILED_MAP-mapquest
+#
+# The url for tiled maps defaults to http://tile.openstreetmap.org/. For
+# static maps it defaults to http://ojw.dev.openstreetmap.org/StaticMap/
-+URL http://andy.sandbox.cloudmade.com/tiles/cycle/
++URL http://otile3.mqcdn.com/tiles/1.0.0/osm/
+
+# Tile extension defaults to png
+#TILE_EXT png
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/xastir.git
More information about the pkg-hamradio-commits
mailing list