[Magicmap-commits] magicmapserver/src/net/sf/magicmap/server/facade MapFacade.java,1.10,1.11

[Florian L. <fle...@us...>]

Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1364/src/net/sf/magicmap/server/facade

Modified Files:
	MapFacade.java 
Log Message:
createMap bug fixed

Index: MapFacade.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MapFacade.java	20 Feb 2006 15:21:47 -0000	1.10
--- MapFacade.java	22 Feb 2006 16:28:21 -0000	1.11
***************
*** 127,130 ****
--- 127,161 ----
  			result.setImageWidth(map.getImageWidth());
  			result.setImageURL(map.getImageURL());
+             
+             Collection geoPoints = map.getGeoPositions();
+             int i = 1;
+             while (geoPoints.iterator().hasNext()) {
+                 GeoPosition geoPosition = (GeoPosition) geoPoints.iterator()
+                         .next();
+                 switch (i) {
+                 case 1:
+                     result.setGeoPoint1X(geoPosition.getPosX());
+                     result.setGeoPoint1Y(geoPosition.getPosY());
+                     result.setGeoPoint1Long(geoPosition.getLongitude());
+                     result.setGeoPoint1Lat(geoPosition.getLatitude());
+                     result.setGeoPoint1Alt(geoPosition.getAltitude());
+                     break;
+                 case 2:
+                     result.setGeoPoint2X(geoPosition.getPosX());
+                     result.setGeoPoint2Y(geoPosition.getPosY());
+                     result.setGeoPoint2Long(geoPosition.getLongitude());
+                     result.setGeoPoint2Lat(geoPosition.getLatitude());
+                     result.setGeoPoint2Alt(geoPosition.getAltitude());
+                     break;
+                 case 3:
+                     result.setGeoPoint3X(geoPosition.getPosX());
+                     result.setGeoPoint3Y(geoPosition.getPosY());
+                     result.setGeoPoint3Long(geoPosition.getLongitude());
+                     result.setGeoPoint3Lat(geoPosition.getLatitude());
+                     result.setGeoPoint3Alt(geoPosition.getAltitude());
+                     break;
+                 }
+                 ++i;
+             }
  			JDOUtil.commit(tx);
  		} finally {
***************
*** 165,170 ****
  			result.setImageWidth(map.getImageWidth());
  			result.setImageURL(map.getImageURL());
! 			// ToDo : Statische Werte durch die tatsächlichen ersetzen
! 			Collection geoPoints = map.getGeoPositions();
  			int i = 1;
  			while (geoPoints.iterator().hasNext()) {
--- 196,201 ----
  			result.setImageWidth(map.getImageWidth());
  			result.setImageURL(map.getImageURL());
! 			
!             Collection geoPoints = map.getGeoPositions();
  			int i = 1;
  			while (geoPoints.iterator().hasNext()) {