Index: applications/editors/josm/wmsadapter/orthofotos-bern/RELEASE-NOTES.txt
===================================================================
--- applications/editors/josm/wmsadapter/orthofotos-bern/RELEASE-NOTES.txt	(revision 18619)
+++ applications/editors/josm/wmsadapter/orthofotos-bern/RELEASE-NOTES.txt	(revision 18619)
@@ -0,0 +1,5 @@
+Release 21 - 2009-11-15
+* new: select whether orthofotos of the city of Bern or the region of Bern are displayed
+  (feature request by Jose Riha) 
+  
+  
Index: applications/editors/josm/wmsadapter/orthofotos-bern/VERSION.txt
===================================================================
--- applications/editors/josm/wmsadapter/orthofotos-bern/VERSION.txt	(revision 18617)
+++ applications/editors/josm/wmsadapter/orthofotos-bern/VERSION.txt	(revision 18619)
@@ -1,4 +1,4 @@
 
-Built-On: 2009-08-01 10:02:24
-Build-ID: 22			
+Built-On: 2009-11-15 13:50:26
+Build-ID: 21			
 		
Index: applications/editors/josm/wmsadapter/orthofotos-bern/build.number
===================================================================
--- applications/editors/josm/wmsadapter/orthofotos-bern/build.number	(revision 18617)
+++ applications/editors/josm/wmsadapter/orthofotos-bern/build.number	(revision 18619)
@@ -1,4 +1,4 @@
 #Build Number for ANT. Do not edit!
-#Wed Jul 29 19:04:08 CEST 2009
-build.number=16
+#Sun Nov 15 13:50:25 CET 2009
+build.number=22
 1=
Index: applications/editors/josm/wmsadapter/orthofotos-bern/build.xml
===================================================================
--- applications/editors/josm/wmsadapter/orthofotos-bern/build.xml	(revision 18617)
+++ applications/editors/josm/wmsadapter/orthofotos-bern/build.xml	(revision 18619)
@@ -12,5 +12,5 @@
 
 	<path id="javax.servlet.classpath">
-		  <fileset dir="${basedir}/../javax.servlet" includes="*.jar" />
+		  <fileset dir="${library.dir}" includes="*.jar" />
 	</path>
 	
@@ -85,4 +85,5 @@
 		<copy file="${library.dir}/winstone-0.9.10.jar" todir="${build.dir}/distrib/orthofoto-bern-wms-adapter-${build.number}" />
 		<copy file="${basedir}/README.txt" todir="${build.dir}/distrib/orthofoto-bern-wms-adapter-${build.number}" />
+		<copy file="${basedir}/RELEASE-NOTES.txt" todir="${build.dir}/distrib/orthofoto-bern-wms-adapter-${build.number}" />
 		<copy file="${basedir}/VERSION.txt" todir="${build.dir}/distrib/orthofoto-bern-wms-adapter-${build.number}" />
 		
Index: applications/editors/josm/wmsadapter/orthofotos-bern/src/ch/guggis/josm/bern/servlet/OrthofotoBernWMSAdapter.java
===================================================================
--- applications/editors/josm/wmsadapter/orthofotos-bern/src/ch/guggis/josm/bern/servlet/OrthofotoBernWMSAdapter.java	(revision 18617)
+++ applications/editors/josm/wmsadapter/orthofotos-bern/src/ch/guggis/josm/bern/servlet/OrthofotoBernWMSAdapter.java	(revision 18619)
@@ -83,21 +83,12 @@
 	static public final String DEFAULT_URL_GEN_SESSION_ID2 = "http://www.stadtplan.bern.ch/TBInternet/WebMapPageLV.aspx";
 
-	/**
-	 * the default URL to enter Berns map application. The session ID is
-	 * retrieved from this URL
-	 */
-	static public final String DEFAULT_URL_MAP_APP_ENTRY = "http://www.stadtplan.bern.ch/TBInternet/WebTitlePage.aspx";
-	// static public final String DEFAULT_URL_MAP_APP_ENTRY =
-	// "http://www.stadtplan.bern.ch/TBInternet/WebMapPageLV.aspx";
-
-	/** the default URL to retrieve map tiles from Berns map application */
-	static public final String DEFAULT_URL_MAP_REQUESTS = "http://www.stadtplan.bern.ch/TBInternet/WebMapServer.aspx?VERSION=1.0.0&REQUEST=GETMAP&TYPE=11&LAYERS=TBI_orthofoto_08.mwf&FORMAT=image/jpeg&EXCEPTIONS=image/jpeg";
-
 	/** the logger */
-	private static Logger logger = Logger
-			.getLogger(OrthofotoBernWMSAdapter.class.getName());
+	private static Logger logger = Logger.getLogger(OrthofotoBernWMSAdapter.class.getName());
 
 	HashMap<String, String> cityMapSessionCookies = new HashMap<String, String>();
 
+	static private final String DEFAULT_LAYER = "TBI_orthofoto_08.mwf"; 
+	private String layer = DEFAULT_LAYER;
+	
 	/**
 	 * remembers session cookie retrieved from Berns map server
@@ -312,4 +303,16 @@
 	}
 
+	protected String buildDefaultUrlForMapRequests() {		
+		StringBuffer sb = new StringBuffer();
+		sb.append("http://www.stadtplan.bern.ch/TBInternet/WebMapServer.aspx?");
+		sb.append("VERSION=1.0.0").append("&");
+		sb.append("REQUEST=GETMAP").append("&");
+		sb.append("TYPE=11").append("&");
+		sb.append("LAYERS=").append(layer).append("&");
+		sb.append("FORMAT=image/jpeg").append("&");
+		sb.append("EXCEPTIONS=image/jpeg");
+		return sb.toString();
+	}
+	
 	/**
 	 * handles a tile request
@@ -376,5 +379,5 @@
 		//
 		StringBuffer sb = new StringBuffer();
-		sb.append(DEFAULT_URL_MAP_REQUESTS);
+		sb.append(buildDefaultUrlForMapRequests());
 		sb.append("&WIDTH=");
 		sb.append(width);
@@ -437,20 +440,37 @@
 	}
 
+	protected String buildConfigurationForm(HttpServletRequest req) {
+		StringBuffer sb = new StringBuffer();
+		sb.append("<html><head></head><body>").append("\n");
+		sb.append("<h1>WMS Adapter for Orthofots of Bern</h1>").append("\n");
+		sb.append("Please open <a href=\"http://www.stadtplan.bern.ch/TBInternet/default.aspx?User=1\">the city map of Bern</a> in your browser.</br>").append("\n");
+		sb.append("Then lookup the cookie <strong>ASP.Net_SessionId</strong> for domain <strong>www.stadtplan.bern.ch</strong> in your browser and enter it in the form below.</br>").append("\n");
+		sb.append("<form action=\"").append(req.getRequestURL()).append("\">").append("\n");
+		sb.append("<input type=\"hidden\" name=\"action\" value=\"set-session-id\">").append("\n");
+		sb.append("Session ID: <input type=\"text\" name=\"session-id\" value=\"\"><br/>").append("\n");
+		sb.append("Select a layer:<br/>").append("\n");
+		String checked;
+		if (layer == null || layer.equals("TBI_orthofoto_08.mwf")) {
+			checked=" checked ";			
+		} else {
+			checked = "";
+		}		
+		sb.append("<input type=\"radio\" name=\"layer\" value=\"TBI_orthofoto_08.mwf\"").append(checked).append(">Luftbilder 2008 Stadt Bern<br>").append("\n");
+		if (layer != null && layer.equals("orthofoto_Regio_08.mwf")) {
+			checked=" checked ";			
+		} else {
+			checked = "";
+		}
+		sb.append("<input type=\"radio\" name=\"layer\" value=\"orthofoto_Regio_08.mwf\"").append(checked).append(">Luftbilder 2008 Region Bern<br>").append("\n");
+		sb.append("<input type=\"submit\" value=\"Submit\">").append("\n");
+		sb.append("</form").append("\n");
+		sb.append("</body></html>").append("\n");
+		return sb.toString();
+
+	}
 	protected void renderSessionIDInputForm(HttpServletRequest req,
 			HttpServletResponse resp) throws IOException {
-		String msg = "<html><head></head><body>\n"
-				+ "<h1>WMS Adapter for Orthofots of Bern</h1>"
-				+ "Please open <a href=\"http://www.stadtplan.bern.ch/TBInternet/default.aspx?User=1\">the city map of Bern</a> in your browser.</br>"
-				+ "Then lookup the cookie <strong>ASP.Net_SessionId</strong> for domain <strong>www.stadtplan.bern.ch</strong> in your browser and enter it in the form below.</br>\n"
-				+ "<form action=\""
-				+ req.getRequestURL()
-				+ "\">\n"
-				+ "<input type=\"hidden\" name=\"action\" value=\"set-session-id\">\n"
-				+ "<input type=\"text\" name=\"session-id\" value=\"\">\n"
-				+ "<input type=\"submit\" value=\"Submit\">\n" + "</form>\n"
-				+ "</body></html>";
-
 		PrintWriter pw = new PrintWriter(resp.getWriter());
-		pw.println(msg);
+		pw.println(buildConfigurationForm(req));
 	}
 
@@ -460,4 +480,9 @@
 		if (req.getParameter("session-id") == null) {
 			throw new MissingParameterException("session-id");
+		}
+		if (req.getParameter("layer") != null) {
+			layer = req.getParameter("layer");
+		} else {
+			layer = DEFAULT_LAYER;
 		}