[gpstrack~subversion:35] fixed onlinem map mode
- From: przemk@kenai.com
- To: commits@gpstrack.kenai.com
- Subject: [gpstrack~subversion:35] fixed onlinem map mode
- Date: Sat, 3 Oct 2009 08:47:07 +0000
Project: gpstrack
Repository: subversion
Revision: 35
Author: przemk
Date: 2009-10-03 08:47:05 UTC
Link:
Log Message:
------------
fixed onlinem map mode
Revisions:
----------
35
Modified Paths:
---------------
GpsTrack/src/pl/przemkalicki/gpstrack/GpsMaps.java
GpsTrack/src/org/qcontinuum/gpstrack/GpsTrack.java
GpsTrack/src/pl/przemkalicki/gpstrack/ImgMaps.java
GpsTrack/src/org/qcontinuum/gpstrack/MainMenu.java
GpsTrack/nbproject/project.properties
GpsTrack/src/pl/przemkalicki/gpstrack/PreMaps.java
Diffs:
------
Index: GpsTrack/nbproject/project.properties
===================================================================
--- GpsTrack/nbproject/project.properties (revision 34)
+++ GpsTrack/nbproject/project.properties (revision 35)
@@ -55,7 +55,7 @@
libs.classpath=
main.class=
main.class.class=applet
-manifest.apipermissions=MIDlet-Permissions:
javax.microedition.pim.ContactList.read,javax.microedition.pim.ContactList.write,javax.microedition.pim.EventList.read,javax.microedition.pim.EventList.write,javax.microedition.pim.ToDoList.read,javax.microedition.pim.ToDoList.write,javax.microedition.io.Connector.file.read,javax.microedition.io.Connector.file.write\n
+manifest.apipermissions=MIDlet-Permissions:
javax.microedition.pim.ContactList.read,
javax.microedition.pim.ContactList.write,
javax.microedition.pim.EventList.read,
javax.microedition.pim.EventList.write, javax.microedition.pim.ToDoList.read,
javax.microedition.pim.ToDoList.write,
javax.microedition.io.Connector.file.read,
javax.microedition.io.Connector.file.write,
javax.microedition.io.Connector.http, javax.microedition.io.Connector.https\n
manifest.file=manifest.mf
manifest.jad=
manifest.manifest=
Index: GpsTrack/src/org/qcontinuum/gpstrack/MainMenu.java
===================================================================
--- GpsTrack/src/org/qcontinuum/gpstrack/MainMenu.java (revision 34)
+++ GpsTrack/src/org/qcontinuum/gpstrack/MainMenu.java (revision 35)
@@ -15,10 +15,10 @@
MainMenu(GpsTrack aThis) {
- super("GPS Track");
+ super("GPS Track+");
this.gpstrack = aThis;
- append(new StringItem(null, "GPS Track\n"));
- append(new StringItem(null, "Version 1.1\n"));
+ append(new StringItem(null, "GPS Track+\n"));
+ append(new StringItem(null, "Version 1.2\n"));
addCommand(mStartCommand = new Command("Start", Command.SCREEN, 0));
addCommand(mTracksCommand = new Command("Tracks", Command.SCREEN,
1));
addCommand(mOptionsCommand = new Command("Options", Command.SCREEN,
1));
@@ -40,6 +40,7 @@
GpsTrack.display(new OptionsMenu(this));
} else if (c == mMapsCommand) {
gpstrack.onlineGPS = false;
+ gpstrack.startApp();
GpsTrack.display(new GpsMaps(this, gpstrack));
} else if (c == mDescriptionCommand) {
GpsTrack.display(
Index: GpsTrack/src/org/qcontinuum/gpstrack/GpsTrack.java
===================================================================
--- GpsTrack/src/org/qcontinuum/gpstrack/GpsTrack.java (revision 34)
+++ GpsTrack/src/org/qcontinuum/gpstrack/GpsTrack.java (revision 35)
@@ -49,10 +49,13 @@
public String komunikat4 = " ";
public String komunikat5 = " ";
public boolean blokada;
- public int zoom = 16;
+ public int zoom = 11;
+ public int minzoom = 6;
+ public int maxzoom = 16;
public int tzoom;
public String path;
public boolean onlineGPS = true;
+ public boolean allowNet = false;
public boolean autocenter = true;
public Float latitude = new Float(522292, -4);
public Float longitude = new Float(209776, -4);
Index: GpsTrack/src/pl/przemkalicki/gpstrack/PreMaps.java
===================================================================
--- GpsTrack/src/pl/przemkalicki/gpstrack/PreMaps.java (revision 34)
+++ GpsTrack/src/pl/przemkalicki/gpstrack/PreMaps.java (revision 35)
@@ -1,7 +1,6 @@
// GpsTrack+
// Copyright (C) 2009 Przem Kalicki
// http://www.przemkalicki.pl/
-
package pl.przemkalicki.gpstrack;
import org.qcontinuum.gpstrack.*;
@@ -11,6 +10,7 @@
import java.io.InputStream;
import java.util.Enumeration;
import javax.microedition.io.Connector;
+import javax.microedition.io.HttpConnection;
import javax.microedition.io.file.FileConnection;
import javax.microedition.io.file.FileSystemRegistry;
import javax.microedition.lcdui.Graphics;
@@ -28,7 +28,7 @@
//private String DATHHEAD = "file://";
private String currentDir;
private GpsMaps gm = null;
- private int wymiar = 0;
+// private int wymiar = 0;
int[][] tablica = new int[4][3];
Image[] obrazki = new Image[4];
int last = 0;
@@ -44,10 +44,14 @@
// this.wymiar = wymiar;
// }
public Image readImage(int zoom, int X_sl, int Y_sl) {
- currentDir = gpstrack.path;
+ InputStream is = null;
+ FileConnection fc = null;
+ HttpConnection hc = null;
boolean pobranie = true;
int z = 0, x = 0, y = 0;
Image image = null;
+ currentDir = gpstrack.path;
+
for (int i = 0; i < 4; i++) {
z = tablica[i][0];
x = tablica[i][1];
@@ -63,14 +67,9 @@
gpstrack.komunikat5 = gpstrack.komunikat5 +
"[" + DATHHEAD + currentDir + "OSM/" + zoom + "/" + X_sl +
"/" + Y_sl + ".png" + "]";
if (pobranie) {
- InputStream is = null;
- FileConnection fc = null;
-
try {
fc = (FileConnection) Connector.open(DATHHEAD + currentDir +
"OSM/" + zoom + "/" + X_sl + "/" + Y_sl + ".png");
- System.out.println(DATHHEAD + currentDir +
- "OSM/" + zoom + "/" + X_sl + "/" + Y_sl + ".png");
gpstrack.komunikat3 = gpstrack.komunikat3 + "[" + DATHHEAD +
currentDir + "]";
gpstrack.komunikat2 = gpstrack.komunikat2 + zoom + "/" +
X_sl + "/" + Y_sl;
is = fc.openInputStream();
@@ -88,17 +87,55 @@
}
} catch (Exception e) {
try {
- image = Image.createImage("/icons/osm_logo.png");
- obrazki[last] = image;
- z = tablica[last][0] = zoom;
- x = tablica[last][1] = X_sl;
- y = tablica[last][2] = Y_sl;
- if (last < 3) {
- last++;
+ if (gpstrack.allowNet) {
+ gpstrack.komunikat1 = "|" + gpstrack.allowNet + "|";
+
System.out.println("http://a.tile.openstreetmap.org/" + zoom + "/" + X_sl + ;
"/" + Y_sl + ".png");
+ hc = (HttpConnection) Connector.open("" +
+ "http://a.tile.openstreetmap.org/" + zoom + ;
"/" + X_sl + "/" + Y_sl + ".png");
+ //
System.out.println("http://a.tile.openstreetmap.org/ otwarty";);
+ is = hc.openInputStream();
+ image = Image.createImage(is);
+ obrazki[last] = image;
+ z = tablica[last][0] = zoom;
+ x = tablica[last][1] = X_sl;
+ y = tablica[last][2] = Y_sl;
+ is.close();
+ hc.close();
+ if (last < 3) {
+ last++;
+ } else {
+ last = 0;
+ }
+
} else {
- last = 0;
+ gpstrack.komunikat1 = "|" + gpstrack.allowNet + "|";
+ image = Image.createImage("/icons/osm_logo.png");
+ obrazki[last] = image;
+ z = tablica[last][0] = zoom;
+ x = tablica[last][1] = X_sl;
+ y = tablica[last][2] = Y_sl;
+ if (last < 3) {
+ last++;
+ } else {
+ last = 0;
+ }
}
} catch (Exception e2) {
+ try {
+ image = Image.createImage("/icons/osm_logo.png");
+ obrazki[last] = image;
+ z = tablica[last][0] = zoom;
+ x = tablica[last][1] = X_sl;
+ y = tablica[last][2] = Y_sl;
+ if (last < 3) {
+ last++;
+ } else {
+ last = 0;
+ }
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+
}
gpstrack.komunikat0 = gpstrack.komunikat0 +
"PreMaps:readImage";
@@ -147,8 +184,12 @@
/**
* @param wymiar the wymiar to set
*/
- public void setWymiar(int wymiar) {
- this.wymiar = wymiar;
+ public void clearCache() {
+ for (int i = 0; i < 4; i++) {
+ tablica[i][0] = 0;
+ tablica[i][1] = 0;
+ tablica[i][2] = 0;
+ }
}
void showOsmDir() {
@@ -197,7 +238,7 @@
while (e3.hasMoreElements() && (!przerwij)) {
String fileName3 = (String)
e3.nextElement();
gpstrack.komunikat0 =
gpstrack.komunikat0 + fileName3;
- System.out.println(")" + fileName3);
+ // System.out.println(")" + fileName3);
if (fileName3.equals("OSM/")) {
gpstrack.path = fileName + fileName2;
przerwij = true;
Index: GpsTrack/src/pl/przemkalicki/gpstrack/GpsMaps.java
===================================================================
--- GpsTrack/src/pl/przemkalicki/gpstrack/GpsMaps.java (revision 34)
+++ GpsTrack/src/pl/przemkalicki/gpstrack/GpsMaps.java (revision 35)
@@ -55,17 +55,17 @@
public void keyPressed(int key) {
if (key == 42) {
// System.out.println("zmniejszamy skale");
- if (gpstrack.zoom > 10) {
+ if (gpstrack.zoom > gpstrack.minzoom) {
gpstrack.zoom = gpstrack.zoom - 1;
} else {
- gpstrack.zoom = 10;
+ gpstrack.zoom = gpstrack.minzoom;
}
} else if (key == 35) {
// System.out.println("zwiekszamy skale");
- if (gpstrack.zoom < 16) {
+ if (gpstrack.zoom < gpstrack.maxzoom) {
gpstrack.zoom = gpstrack.zoom + 1;
} else {
- gpstrack.zoom = 16;
+ gpstrack.zoom = gpstrack.maxzoom;
}
} else if (key == -1 || key == 50) {
gpstrack.latitude = gpstrack.latitude.Add(gpstrack.step);
@@ -81,6 +81,14 @@
} else {
gpstrack.autocenter = true;
}
+ } else if (key == 57) {
+ if (gpstrack.allowNet) {
+ gpstrack.allowNet = false;
+ } else {
+ gpstrack.allowNet = true;
+ PreMaps pm = GpsTrack.getPreMaps();
+ pm.clearCache();
+ }
} else if (key == 48) {
if (gpstrack.debug == 0) {
gpstrack.debug = 1;
@@ -105,7 +113,6 @@
//Runtime rt = Runtime.getRuntime();
//gpstrack.komunikat0 = (rt.totalMemory() - rt.freeMemory()) +
"/" + rt.totalMemory();
- //gpstrack.komunikat0 = "";
int midX = getWidth() / 2;
int midY = getHeight() / 2;
@@ -119,10 +126,8 @@
int y = 0;
EarthPosition earthPosition = null;
if (gpstrack.onlineGPS && gpstrack.autocenter) {
- //System.out.println("gpstrack.onlineGPS:" +
gpstrack.onlineGPS);
earthPosition = mGps.getEarthPosition();
} else {
- //System.out.println("gpstrack.onlineGPS:" +
gpstrack.onlineGPS);
earthPosition = new EarthPosition(gpstrack);
}
Index: GpsTrack/src/pl/przemkalicki/gpstrack/ImgMaps.java
===================================================================
--- GpsTrack/src/pl/przemkalicki/gpstrack/ImgMaps.java (revision 34)
+++ GpsTrack/src/pl/przemkalicki/gpstrack/ImgMaps.java (revision 35)
@@ -1,7 +1,6 @@
// GpsTrack+
// Copyright (C) 2009 Przem Kalicki
// http://www.przemkalicki.pl/
-
package pl.przemkalicki.gpstrack;
/**
@@ -29,15 +28,11 @@
Float lat;
Float lon;
AdresFloat adres;
- int wymiar, wymiarx, wymiary;
+ int wymiarx, wymiary;
Graphics g;
GpsMaps gm;
GpsTrack gpstrack;
Image image1 = null;
-// Image image1 = null;
- // Image image1 = null;
- //Image image1 = null;
- //Image image5 = null;
public ImgMaps(GpsTrack gpstrack) {
this.gpstrack = gpstrack;
@@ -58,27 +53,28 @@
int y;
if (wymiarx <= wymiary) {
- wymiar = wymiarx - 1;
+ // wymiar = wymiarx - 1;
} else {
- wymiar = wymiary - 1;
+ // wymiar = wymiary - 1;
}
- if (wymiar > 250) {
- wymiar = 250;
+ if (wymiarx > 250) {
+ wymiarx = 250;
}
- gpstrack.komunikat1 = "wym:" + wymiarx + " " + wymiary + " " +
wymiar;
+ if (wymiary > 250) {
+ wymiary = 250;
+ }
+
+ gpstrack.komunikat1 = "wym:" + wymiarx + " " + wymiary;
gpstrack.komunikat4 = "x";
gpstrack.komunikat5 = "";
PreMaps pm = GpsTrack.getPreMaps();
pm.setGm(gm);
- pm.setWymiar(wymiar);
Float llat = new Float(0);
Float llon = new Float(0);
-// llat.add(lat);
llat = llat.Add(lat);
-// llon.add(lon);
llon = llon.Add(lon);
String fileName = adres.getTileNumber(lat, lon);
gpstrack.komunikat2 = fileName;
@@ -86,13 +82,9 @@
Float pd = new Float(0);
Float ws = new Float(0);
Float zc = new Float(0);
-// pn.add(adres.getNorth());
pn = pn.Add(adres.getNorth());
-// pd.add(adres.getSouth());
pd = pd.Add(adres.getSouth());
-// ws.add(adres.getEast());
ws = ws.Add(adres.getEast());
-// zc.add(adres.getWest());
zc = zc.Add(adres.getWest());
Float step = new Float(0);
@@ -108,40 +100,26 @@
Float r_x = new Float(0);
Float r_y = new Float(0);
-// w_x.add(ws);
w_x = w_x.Add(ws);
-// w_x.sub(zc);
w_x = w_x.Sub(zc);
-// w_x.div(256);
w_x = w_x.Div(256);
-// w_y.add(pn);
w_y = w_y.Add(pn);
-// w_y.sub(pd);
w_y = w_y.Sub(pd);
-// w_y.div(256);
w_y = w_y.Div(256);
-// r_x.add(llon);
r_x = r_x.Add(llon);
-// r_x.sub(zc);
r_x = r_x.Sub(zc);
-// r_x.div(w_x);
r_x = r_x.Div(w_x);
-// r_x.floor();
r_x = r_x = Float.floor(r_x);
-// int ix = r_x.toInteger();
int ix = (int) r_x.toLong();
- //r_y.add(pn);
r_y = r_y.Add(pn);
-// r_y.sub(llat);
r_y = r_y.Sub(llat);
-// r_y.div(w_y);
r_y = r_y.Div(w_y);
-// r_y.floor();
r_y = Float.floor(r_y);
int iy = (int) r_y.toLong();
- int ir = wymiar / 2;
+ int irx = wymiarx / 2;
+ int iry = wymiary / 2;
// A OK ix = 128; iy = 128;
// B OK ix=200; iy=128;
@@ -154,7 +132,7 @@
// I OK ix = 50; iy = 200;
// INNE ix=0; iy=0;
- gpstrack.komunikat4 = "ix iy ir bl: " + ix + " " + iy + " " + ir + "
" + gpstrack.blokada;
+ gpstrack.komunikat4 = "ix iy ir bl: " + ix + " " + iy + " " + " " +
gpstrack.blokada;
this.g = gpstrack.graphics;
g.setColor(0xFFFFFF);
@@ -170,28 +148,36 @@
int dcx = 0;
int dcy = 0;
+ //korekta o jeden pixel
+ if (ix == 0) {
+ ix = 1;
+ }
+ if (iy == 0) {
+ iy = 1;
+ }
+
try {
image1 = pm.readImage(adres.getZoom_sl(), adres.getX_sl(),
adres.getY_sl());
- if (ix > ir && ix < (256 - ir) && iy > ir && iy < (256 - ir)) {
+ if (ix >= irx && ix < (256 - irx) && iy >= iry && iy < (256 -
iry)) {
gpstrack.komunikat3 = "--A--";
- x1 = ix - ir;
- y1 = iy - ir;
- dx = wymiar;
+ x1 = ix - irx;
+ y1 = iy - iry;
+ dx = wymiarx;
dcx = dcx + dx;
- dy = wymiar;
+ dy = wymiary;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
ry = 0;
g.drawImage(image1, rx, ry, 0);
- } else if (ix > (256 - ir) && ix < 256 && iy > ir && iy < (256 -
ir)) {
+ } else if (ix >= (256 - irx) && ix < 256 && iy >= iry && iy <
(256 - iry)) {
gpstrack.komunikat3 = "--B--";
- x1 = ix - ir;
- y1 = iy - ir;
- dx = ir + (256 - ix);
+ x1 = ix - irx;
+ y1 = iy - iry;
+ dx = irx + (256 - ix);
dcx = dcx + dx;
- dy = wymiar;
+ dy = wymiary;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
@@ -201,49 +187,49 @@
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl() +
1), (adres.getY_sl()));
x1 = 0;
- y1 = iy - ir;
- dx = ir - (256 - ix);
+ y1 = iy - iry;
+ dx = irx - (256 - ix);
dcx = dcx + dx;
- dy = wymiar;
+ dy = wymiary;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
- rx = ir + (256 - ix);
+ rx = irx + (256 - ix);
ry = 0;
g.drawImage(image1, rx, ry, 0);
image1 = null;
- } else if (ix > 0 && ix < ir && iy > ir && iy < (256 - ir)) {
+ } else if (ix >= 0 && ix < irx && iy >= iry && iy < (256 - iry))
{
gpstrack.komunikat3 = "--C--";
x1 = 0;
- y1 = iy - ir;
- dx = ir + ix;
+ y1 = iy - iry;
+ dx = irx + ix;
dcx = dcx + dx;
- dy = wymiar;
+ dy = wymiary;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
- rx = ir - ix;
+ rx = irx - ix;
ry = 0;
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl() -
1), (adres.getY_sl()));
- x1 = 256 - (ir - ix);
- y1 = iy - ir;
- dx = ir - ix;
+ x1 = 256 - (irx - ix);
+ y1 = iy - iry;
+ dx = irx - ix;
dcx = dcx + dx;
- dy = wymiar;
+ dy = wymiary;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
ry = 0;
g.drawImage(image1, rx, ry, 0);
image1 = null;
- } else if (ix > ir && ix < (256 - ir) && iy > (256 - ir) && iy <
256) {
+ } else if (ix >= irx && ix < (256 - irx) && iy >= (256 - iry) &&
iy < 256) {
gpstrack.komunikat3 = "--D--";
- x1 = ix - ir;
- y1 = iy - ir;
- dx = wymiar;
+ x1 = ix - irx;
+ y1 = iy - iry;
+ dx = wymiarx;
dcx = dcx + dx;
- dy = ir + (256 - iy);
+ dy = iry + (256 - iy);
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
@@ -252,50 +238,50 @@
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl()),
(adres.getY_sl() + 1));
- x1 = ix - ir;
+ x1 = ix - irx;
y1 = 0;
- dx = wymiar;
+ dx = wymiarx;
dcx = dcx + dx;
- dy = wymiar - (ir + 256 - iy);
+ dy = wymiary - (iry + 256 - iy);
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
- ry = ir + (256 - iy);
+ ry = iry + (256 - iy);
g.drawImage(image1, rx, ry, 0);
image1 = null;
- } else if (ix > ir && ix < (256 - ir) && iy > 0 && iy < ir) {
+ } else if (ix >= irx && ix < (256 - irx) && iy >= 0 && iy < iry)
{
gpstrack.komunikat3 = "--E--";
- x1 = ix - ir;
+ x1 = ix - irx;
y1 = 0;
- dx = wymiar;
+ dx = wymiarx;
dcx = dcx + dx;
- dy = iy + ir;
+ dy = iy + iry;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
- ry = ir - iy;
+ ry = irx - iy;
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl()),
(adres.getY_sl() - 1));
- x1 = ix - ir;
- y1 = 256 - (ir - iy);
- dx = wymiar;
+ x1 = ix - irx;
+ y1 = 256 - (iry - iy);
+ dx = wymiarx;
dcx = dcx + dx;
- dy = ir - iy;
+ dy = iry - iy;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
ry = 0;
g.drawImage(image1, rx, ry, 0);
image1 = null;
- } else if (ix > (256 - ir) && ix < 256 && iy > (256 - ir) && iy
< 256) {
+ } else if (ix >= (256 - irx) && ix < 256 && iy >= (256 - iry) &&
iy < 256) {
gpstrack.komunikat3 = "--F--";
- x1 = ix - ir;
- y1 = iy - ir;
- dx = (256 - ix) + ir;
+ x1 = ix - irx;
+ y1 = iy - iry;
+ dx = (256 - ix) + irx;
dcx = dcx + dx;
- dy = 256 - iy + ir;
+ dy = 256 - iy + iry;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
@@ -304,128 +290,128 @@
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl()),
(adres.getY_sl() + 1));
- x1 = ix - ir;
+ x1 = ix - irx;
y1 = 0;
- dx = (256 - ix) + ir;
+ dx = (256 - ix) + irx;
dcx = dcx + dx;
- dy = wymiar - (256 - iy + ir);
+ dy = wymiary - (256 - iy + iry);
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
- ry = ir + (256 - iy);
+ ry = iry + (256 - iy);
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl() +
1), (adres.getY_sl() + 1));
x1 = 0;
y1 = 0;
- dx = ir - (256 - ix);
+ dx = irx - (256 - ix);
dcx = dcx + dx;
- dy = wymiar - (256 - iy + ir);
+ dy = wymiary - (256 - iy + iry);
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
- rx = 256 - ix + ir;
- ry = 256 - iy + ir;
+ rx = 256 - ix + irx;
+ ry = 256 - iy + iry;
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl() +
1), (adres.getY_sl()));
x1 = 0;
- y1 = iy - ir;
- dx = ir - (256 - ix);
+ y1 = iy - iry;
+ dx = irx - (256 - ix);
dcx = dcx + dx;
- dy = 256 - iy + ir;
+ dy = 256 - iy + iry;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
- rx = 256 - ix + ir;
+ rx = 256 - ix + irx;
ry = 0;
g.drawImage(image1, rx, ry, 0);
image1 = null;
- } else if (ix > (256 - ir) && ix < 256 && iy > 0 && iy < ir) {
+ } else if (ix >= (256 - irx) && ix < 256 && iy >= 0 && iy < iry)
{
gpstrack.komunikat3 = "--G--";
- x1 = ix - ir;
+ x1 = ix - irx;
y1 = 0;
- dx = ir + 256 - ix;
+ dx = irx + 256 - ix;
dcx = dcx + dx;
- dy = iy + ir;
+ dy = iy + iry;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
- ry = ir - iy;
+ ry = iry - iy;
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl() +
1), (adres.getY_sl()));
x1 = 0;
y1 = 0;
- dx = ir - (256 - ix);
+ dx = irx - (256 - ix);
dcx = dcx + dx;
- dy = iy + ir;
+ dy = iy + iry;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
- rx = ir + (256 - ix);
- ry = ir - iy;
+ rx = irx + (256 - ix);
+ ry = iry - iy;
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl() +
1), (adres.getY_sl() - 1));
x1 = 0;
- y1 = 256 - (ir - iy);
- dx = ir - (256 - ix);
+ y1 = 256 - (iry - iy);
+ dx = irx - (256 - ix);
dcx = dcx + dx;
- dy = ir - iy;
+ dy = iry - iy;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
- rx = ir + (256 - ix);
+ rx = irx + (256 - ix);
ry = 0;
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl()),
(adres.getY_sl() - 1));
- x1 = ix - ir;
- y1 = 256 - (ir - iy);
- dx = 256 - (ix - ir);
+ x1 = ix - irx;
+ y1 = 256 - (iry - iy);
+ dx = 256 - (ix - irx);
dcx = dcx + dx;
- dy = ir - iy;
+ dy = iry - iy;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
ry = 0;
g.drawImage(image1, rx, ry, 0);
image1 = null;
- } else if (ix > 0 && ix < ir && iy > 0 && iy < ir) {
+ } else if (ix >= 0 && ix < irx && iy >= 0 && iy < iry) {
gpstrack.komunikat3 = "--H--";
x1 = 0;
y1 = 0;
- dx = ix + ir;
+ dx = ix + irx;
dcx = dcx + dx;
- dy = iy + ir;
+ dy = iy + iry;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
- rx = ir - ix;
- ry = ir - iy;
+ rx = irx - ix;
+ ry = iry - iy;
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl()),
(adres.getY_sl() - 1));
x1 = 0;
- y1 = 256 - (ir - iy);
- dx = ix + ir;
+ y1 = 256 - (iry - iy);
+ dx = ix + irx;
dcx = dcx + dx;
- dy = ir - iy;
+ dy = iry - iy;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
- rx = ir - ix;
+ rx = irx - ix;
ry = 0;
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl() -
1), (adres.getY_sl() - 1));
- x1 = 256 - (ir - ix);
- y1 = 256 - (ir - iy);
- dx = ir - ix;
+ x1 = 256 - (irx - ix);
+ y1 = 256 - (iry - iy);
+ dx = irx - ix;
dcx = dcx + dx;
- dy = ir - iy;
+ dy = iry - iy;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
@@ -434,37 +420,37 @@
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl() -
1), (adres.getY_sl()));
- x1 = 256 - (ir - ix);
+ x1 = 256 - (irx - ix);
y1 = 0;
- dx = ir - ix;
+ dx = irx - ix;
dcx = dcx + dx;
- dy = iy + ir;
+ dy = iy + iry;
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
- ry = ir - iy;
+ ry = iry - iy;
g.drawImage(image1, rx, ry, 0);
image1 = null;
- } else if (ix > 0 && ix < ir && iy > (256 - ir) && iy < 256) {
+ } else if (ix >= 0 && ix < irx && iy >= (256 - iry) && iy < 256)
{
gpstrack.komunikat3 = "--I--";
x1 = 0;
- y1 = iy - ir;
- dx = ix + ir;
+ y1 = iy - iry;
+ dx = ix + irx;
dcx = dcx + dx;
- dy = ir + (256 - iy);
+ dy = iry + (256 - iy);
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
- rx = ir - ix;
+ rx = irx - ix;
ry = 0;
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl() -
1), (adres.getY_sl()));
- x1 = 256 - (ir - ix);
- y1 = iy - ir;
- dx = ir - ix;
+ x1 = 256 - (irx - ix);
+ y1 = iy - iry;
+ dx = irx - ix;
dcx = dcx + dx;
- dy = ir + (256 - iy);
+ dy = iry + (256 - iy);
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
@@ -473,35 +459,35 @@
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl() -
1), (adres.getY_sl() + 1));
- x1 = 256 - (ir - ix);
+ x1 = 256 - (irx - ix);
y1 = 0;
- dx = ir - ix;
+ dx = irx - ix;
dcx = dcx + dx;
- dy = ir - (256 - iy);
+ dy = iry - (256 - iy);
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
rx = 0;
- ry = ir + (256 - iy);
+ ry = iry + (256 - iy);
g.drawImage(image1, rx, ry, 0);
image1 = null;
image1 = pm.readImage(adres.getZoom_sl(), (adres.getX_sl()),
(adres.getY_sl() + 1));
x1 = 0;
y1 = 0;
- dx = ix + ir;
+ dx = ix + irx;
dcx = dcx + dx;
- dy = ir - (256 - iy);
+ dy = iry - (256 - iy);
dcy = dcy + dy;
image1 = Image.createImage(image1, x1, y1, dx, dy,
Sprite.TRANS_NONE);
- rx = ir - ix;
- ry = ir + (256 - iy);
+ rx = irx - ix;
+ ry = iry + (256 - iy);
g.drawImage(image1, rx, ry, 0);
image1 = null;
} else {
gpstrack.komunikat3 = "--INNE--";
g.setColor(0x0000FF);
- x = wymiar / 2;
- y = wymiar / 2;
+ x = wymiarx / 2;
+ y = wymiary / 2;
g.drawArc(x - 15, y - 15, 30, 30, 0, 360);
g.drawArc(x - 20, y - 20, 40, 40, 0, 360);
g.drawArc(x - 25, y - 25, 50, 50, 0, 360);
@@ -509,13 +495,14 @@
gpstrack.komunikat3 = gpstrack.komunikat3 + "|" + gpstrack.path
+ "|";
} catch (Exception e) {
gpstrack.komunikat0 = gpstrack.komunikat0 + "ImgMaps2:run";
+ gpstrack.blokada = false;
}
//System.out.println("dcx:" + dcx + " dcy:" + dcy);
image1 = null;
g.setColor(0xff0000);
- x = wymiar / 2;
- y = wymiar / 2;
+ x = wymiarx / 2;
+ y = wymiary / 2;
g.fillArc(x - 3, y - 3, 6, 6, 0, 360);
g.drawArc(x - 5, y - 5, 10, 10, 0, 360);
g.drawArc(x - 7, y - 7, 14, 14, 0, 360);
|
[gpstrack~subversion:35] fixed onlinem map mode |
przemk | 10/03/2009 |
