diff -N -r -u qpegps_0.9.1/doc/qpegps.html qpegps_0.9.1ratio/doc/qpegps.html --- qpegps_0.9.1/doc/qpegps.html 2003-04-09 23:06:44.000000000 -0400 +++ qpegps_0.9.1ratio/doc/qpegps.html 2004-04-11 15:43:23.000000000 -0400 @@ -12,19 +12,27 @@
-

qpeGPS

+

qpeGPS 0.9.1r*

qpeGPS is a program for displaying a map centered at the current position as read from a gps receiver. It uses the NMEA output of the GPS receiver. +

+*Note: This is a proprietary version which deviates from +the standard qpeGPS source tree. The sources.txt file +format has been changed to incorporate a qpeGPS scale to web +site map scale ratio. + +The original authors should not be expected to support +this release.

back

1. CONFIG

The path to directory where the images of the maps are stored -can be selected (the internal configuration files maps.txt and sources.txt are in the +can be selected (the internal configuration files maps.txt and sources.txt are in the same directory). This can be used for selecting different storage devices or for the selection of different kind of maps (street, aviation, nautic...).

@@ -196,9 +204,40 @@

Map Source Configuration

Qpegps uses a text configuration file to store map download source specifications. -In your qpegps maps directory there is a sources.txt file. You can edit this file to -add additional map sources. Qpegps comes preconfigured with one download source -setup (MapBlast). Look at sources.txt to see the format. +In your qpegps maps directory there is a sources.txt file. You can +edit this file to add additional map sources. Qpegps comes preconfigured with +one download source setup (MapBlast*).

+The format of sources.txt is as follows.

+ + + + + + + + + + + + + + + + + + + + + + +
sourceName:Name for the pull-down list.
pixelWidth:Width of image as downloaded.
pixelHeight:Height of image as downloaded.
scaleRatio:Ratio of qpeGPS scale to web site map scale (1 site_scale = 'scaleRatio' qpeGPS_scale)
url:URL of map request with substitution variables.
+  <LAT>: latitude
+  <LON>: longitude
+  <SCA>: map scale
+
+ +*Note: Always check any usage statements for web site generated maps. +Just because you can download it does not mean it's legal to use for any purpose...

back

3.4 Import Map

@@ -327,7 +366,10 @@ "+" : there is a more detailed map available. You can select it by pressing the "Up" key.
"-" : there is a less detailed map available. You can select it by pressing the "Down" key.
"D" : the next pressing of "Up" will select the "most Detail mode'. - +

+If Your maps are overlapping by 240 pixel vertically and 320 pixel horizontally (screen size), +You will never see the end of a map, because qpeGPS then will always select the map which fills +the screen.

back diff -N -r -u qpegps_0.9.1/fetchmap.cpp qpegps_0.9.1ratio/fetchmap.cpp --- qpegps_0.9.1/fetchmap.cpp 2003-02-06 10:03:21.000000000 -0500 +++ qpegps_0.9.1ratio/fetchmap.cpp 2004-04-09 22:52:39.000000000 -0400 @@ -29,14 +29,15 @@ { QTextIStream *sourceIStream; sourceIStream = new QTextIStream (sourceInfo); - *sourceIStream >> name >> pixelWidth >> pixelHeight >> url; + *sourceIStream >> name >> pixelWidth >> pixelHeight >> scaleRatio >> url; } -MapSource::MapSource(QString lname, int pWidth, int pHeight, QString lurl) +MapSource::MapSource(QString lname, int pWidth, int pHeight, float sRatio, QString lurl) { name = lname; pixelWidth = pWidth; pixelHeight = pHeight; + scaleRatio = sRatio; url = lurl; } @@ -67,7 +68,7 @@ const QString lonVal = string.setNum(spec->longitude * spec->lonHem); const QString latVal = string.setNum(spec->latitude * spec->latHem); - const QString scaVal = string.setNum(spec->scale); + const QString scaVal = string.setNum(floor(((float)spec->scale/scaleRatio) * 100000000.0 + 0.5)/100000000.0); urlstr.replace(lon, lonVal); urlstr.replace(lat, latVal); diff -N -r -u qpegps_0.9.1/fetchmap.h qpegps_0.9.1ratio/fetchmap.h --- qpegps_0.9.1/fetchmap.h 2003-02-06 10:03:21.000000000 -0500 +++ qpegps_0.9.1ratio/fetchmap.h 2004-04-09 22:51:13.000000000 -0400 @@ -70,7 +70,7 @@ public: MapSource(QString *sourceInfo); - MapSource(QString lname, int pWidth, int pHeight, QString lurl); + MapSource(QString lname, int pWidth, int pHeight, float sRatio, QString lurl); ~MapSource(); int operator==(MapSource&); int operator<(MapSource&); @@ -81,6 +81,7 @@ QString url; int pixelWidth; int pixelHeight; + float scaleRatio; }; diff -N -r -u qpegps_0.9.1/qpegps.cpp qpegps_0.9.1ratio/qpegps.cpp --- qpegps_0.9.1/qpegps.cpp 2003-06-01 23:59:23.000000000 -0400 +++ qpegps_0.9.1ratio/qpegps.cpp 2004-04-11 13:06:49.000000000 -0400 @@ -424,7 +424,7 @@ // create the *viewer* which can switch between full screen and normal QWidgetStack * viewer = new QWidgetStack(); // this is the main widget - viewer->setCaption("qpeGPS 0.9.1"); + viewer->setCaption("qpeGPS 0.9.1r"); // create the qpegps main appl widget (with viewer as parent) Qpegps *qpegps = new Qpegps(dir, viewer); diff -N -r -u qpegps_0.9.1/sources.txt qpegps_0.9.1ratio/sources.txt --- qpegps_0.9.1/sources.txt 2003-01-10 08:33:07.000000000 -0500 +++ qpegps_0.9.1ratio/sources.txt 2004-04-11 16:36:08.000000000 -0400 @@ -5,5 +5,5 @@ # Use the special tags , , and to specify where the latitude # longitude and scale should be inserted into the url. # -#sourceName pixelWidth pixelHeight url -MapBlast 1280 1024 http://www.mapblast.com/myblastd/MakeMap.d?&CT=::&IC=&W=1280&H=1024&LB= \ No newline at end of file +#sourceName pixelWidth pixelHeight scaleRatio url +MapBlast 1280 1024 1.0 http://www.mapblast.com/myblastd/MakeMap.d?&CT=::&IC=&W=1280&H=1024&LB=