Index: /applications/editors/josm/wmsadapter/orthofotos-bern/README.txt
===================================================================
--- /applications/editors/josm/wmsadapter/orthofotos-bern/README.txt	(revision 16751)
+++ /applications/editors/josm/wmsadapter/orthofotos-bern/README.txt	(revision 16752)
@@ -30,7 +30,5 @@
   you have to retrieve from the WMS server of Bern using your preferred web
   browser (see below in section Usage). 
-
-o currently, tiles for orthofotos of Bern overlap considerably. 
-  
+   
 
 INSTALLATION
@@ -51,7 +49,7 @@
   - add an entry with
        menu name = Orthofotos Bern 
-       WMS-URL   = http://localhost:8787/orthofotos-bern?action=getmap
-       
-    
+       WMS-URL   = http://localhost:8787/orthofotos-bern?    !!! Note the trailing '?' !!!
+
+             
 
 USAGE 
Index: /applications/editors/josm/wmsadapter/orthofotos-bern/VERSION.txt
===================================================================
--- /applications/editors/josm/wmsadapter/orthofotos-bern/VERSION.txt	(revision 16751)
+++ /applications/editors/josm/wmsadapter/orthofotos-bern/VERSION.txt	(revision 16752)
@@ -1,4 +1,4 @@
 
-Built-On: 2009-07-29 19:04:09
-Build-ID: 15			
+Built-On: 2009-08-01 10:02:24
+Build-ID: 22			
 		
Index: /applications/editors/josm/wmsadapter/orthofotos-bern/build.xml
===================================================================
--- /applications/editors/josm/wmsadapter/orthofotos-bern/build.xml	(revision 16752)
+++ /applications/editors/josm/wmsadapter/orthofotos-bern/build.xml	(revision 16752)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="orthofoto-bern" default="default">
+    <description>
+     
+    </description>
+	
+	<property name="source.dir" value="${basedir}/src"/>
+	<property name="library.dir" value="${basedir}/lib"/>
+	<property name="build.dir" value="${basedir}/build"/>
+	<property name="build.dir.classes" value="${build.dir}/classes"/>
+	<property name="build.dir.lib" value="${build.dir}/lib"/>
+
+	<path id="javax.servlet.classpath">
+		  <fileset dir="${basedir}/../javax.servlet" includes="*.jar" />
+	</path>
+	
+	<path id="project.classpath">
+		 <path refid="javax.servlet.classpath" /> 
+	</path>
+
+	<!-- *********************************************************************************** -->
+    <target name="default" depends="clean,compile,servlet.war" description="description">       
+    </target>
+	<!-- *********************************************************************************** -->
+	<target name="init">
+    	<buildnumber file="build.number" />
+		
+	</target>
+	<!-- *********************************************************************************** -->
+	<target name="clean">
+		<delete dir="${build.dir}"/>
+		<mkdir dir="${build.dir}"/>	
+		<mkdir dir="${build.dir.classes}"/>
+		<mkdir dir="${build.dir.lib}"/>
+	</target>
+	<!-- *********************************************************************************** -->
+	<target name="compile">
+		<javac srcdir="${source.dir}"
+			destdir="${build.dir.classes}"
+			classpathref="project.classpath">
+	    </javac>
+	</target>
+
+	<!-- *********************************************************************************** -->
+	<target name="servlet.war" >
+		
+		<tstamp>
+			<format property="timestamp" pattern="yyyy-MM-dd HH:mm:ss"/>
+		 </tstamp>
+
+		<war destfile="${build.dir.lib}/orthofoto-bern-wms-adapter.war"
+			webxml="${basedir}/resources/web.xml">	
+			<classes dir="${build.dir.classes}"> 
+				<include name="ch/guggis/josm/bern/servlet/**/*.class" />
+			</classes>
+			<manifest> 			
+	      		<attribute name="Built-By" value="${user.name}"/>
+	      		<attribute name="Built-On" value="${timestamp}"/>
+	      		<attribute name="Build-Id" value="${build.number}"/>      		
+			</manifest> 
+		</war>		
+	</target>
+	
+	<!-- *********************************************************************************** -->
+	<target name="deploy" depends="init,default">
+		<copy file="${build.dir.lib}/orthofoto-bern-wms-adapter.war" todir="C:\data\projekte\osm\bern-proxy" />
+	</target>
+
+	
+	<!-- *********************************************************************************** -->	
+	<target name="make-distrib" depends="init,default">
+		<mkdir dir="${build.dir}/distrib"/>
+		<mkdir dir="${build.dir}/distrib/orthofoto-bern-wms-adapter-${build.number}"/>
+		
+		<tstamp>
+			<format property="timestamp" pattern="yyyy-MM-dd HH:mm:ss"/>
+		 </tstamp>
+
+		<echo file="VERSION.txt" append="false">
+Built-On: ${timestamp}
+Build-ID: ${build.number}			
+		</echo>
+		
+		<copy file="${build.dir.lib}/orthofoto-bern-wms-adapter.war" todir="${build.dir}/distrib/orthofoto-bern-wms-adapter-${build.number}" />
+		<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}/VERSION.txt" todir="${build.dir}/distrib/orthofoto-bern-wms-adapter-${build.number}" />
+		
+		<zip destfile="${basedir}/distrib/orthofoto-bern-wms-adapter-${build.number}.zip">
+			<zipfileset dir="${build.dir}/distrib/orthofoto-bern-wms-adapter-${build.number}" includes="**/*" prefix="orthofoto-bern-wms-adapter-${build.number}"/>
+		</zip>
+		
+	</target>
+</project>
Index: /applications/editors/josm/wmsadapter/orthofotos-bern/resources/web.xml
===================================================================
--- /applications/editors/josm/wmsadapter/orthofotos-bern/resources/web.xml	(revision 16752)
+++ /applications/editors/josm/wmsadapter/orthofotos-bern/resources/web.xml	(revision 16752)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<web-app>
+
+    <display-name>
+      Adapter for Orthofotos of Bern  
+    </display-name>
+    <description>
+      This servlet provides an adapter for the WMS server of the city of Bern. It 
+      allows JOSM to access orthofotos of Bern through its WMS plugin.
+    </description>
+
+    <context-param>
+    </context-param>
+
+    <servlet>
+      <servlet-name>OrthofotoBernWMSAdapter</servlet-name>
+      <description> This servlet provides an adapter for the WMS server of the city of Bern. It 
+      allows JOSM to access orthofotos of Bern through its WMS plugin.</description>
+      <servlet-class>ch.guggis.josm.bern.servlet.OrthofotoBernWMSAdapter</servlet-class>
+      <init-param>
+      </init-param>
+    </servlet>
+
+    <servlet-mapping>
+      <servlet-name>OrthofotoBernWMSAdapter</servlet-name>
+      <url-pattern>/orthofotos-bern/*</url-pattern>
+    </servlet-mapping>
+
+</web-app>
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 16751)
+++ /applications/editors/josm/wmsadapter/orthofotos-bern/src/ch/guggis/josm/bern/servlet/OrthofotoBernWMSAdapter.java	(revision 16752)
@@ -489,4 +489,8 @@
 
 		String action = req.getParameter("action");
+		if (action == null && req.getParameter("bbox") != null) {
+			action = "getmap";
+		}
+		logger.info("action is <" + action + ">");
 		if ("ping".equals(action)) {
 			handlePing(req, resp);