Index: applications/editors/josm/plugins/openlayers/.classpath
===================================================================
--- applications/editors/josm/plugins/openlayers/.classpath (revision 8748)
+++ applications/editors/josm/plugins/openlayers/.classpath (revision 8748)
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/openlayers/.project
===================================================================
--- applications/editors/josm/plugins/openlayers/.project (revision 8748)
+++ applications/editors/josm/plugins/openlayers/.project (revision 8748)
@@ -0,0 +1,17 @@
+
+
+ openLayers
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
Index: applications/editors/josm/plugins/openlayers/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/openlayers/.settings/org.eclipse.jdt.core.prefs (revision 8748)
+++ applications/editors/josm/plugins/openlayers/.settings/org.eclipse.jdt.core.prefs (revision 8748)
@@ -0,0 +1,78 @@
+#Thu Apr 17 13:20:38 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
Index: applications/editors/josm/plugins/openlayers/README
===================================================================
--- applications/editors/josm/plugins/openlayers/README (revision 8748)
+++ applications/editors/josm/plugins/openlayers/README (revision 8748)
@@ -0,0 +1,19 @@
+A plugin for displaying OpenLayers images as a background
+
+This plugin is a proof of concept, and so it is at a very first stage.
+
+What it does:
+ * It downloads a Yahoo satellite background image of the current view port (well, sort of)
+
+What it does NOT:
+ * Everything else :-)
+
+What needs to be done:
+ * Fix positions
+ * Fix refresh problems
+ * Patch JOSM to restrict zoom to discrete steps (needed by Yahoo)
+ * Get rid of ehcache. It's too bulky for our needs.
+ * Add configuration options.
+ * Allow the user to add any kind of OpenLayer layers
+ * Add options for cache (size, expiration time...)
+ * Find some clever way of distributing dependency libraries. A plugin of 2.1Mb seems too big.
Index: applications/editors/josm/plugins/openlayers/build.xml
===================================================================
--- applications/editors/josm/plugins/openlayers/build.xml (revision 8748)
+++ applications/editors/josm/plugins/openlayers/build.xml (revision 8748)
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/openlayers/resources/ehcache.xml
===================================================================
--- applications/editors/josm/plugins/openlayers/resources/ehcache.xml (revision 8748)
+++ applications/editors/josm/plugins/openlayers/resources/ehcache.xml (revision 8748)
@@ -0,0 +1,473 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/openlayers/resources/yahoo.html
===================================================================
--- applications/editors/josm/plugins/openlayers/resources/yahoo.html (revision 8748)
+++ applications/editors/josm/plugins/openlayers/resources/yahoo.html (revision 8748)
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/Browser.java
===================================================================
--- applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/Browser.java (revision 8748)
+++ applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/Browser.java (revision 8748)
@@ -0,0 +1,109 @@
+package org.openstreetmap.josm.plugins.openLayers;
+
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.lobobrowser.html.HtmlRendererContext;
+import org.lobobrowser.html.UserAgentContext;
+import org.lobobrowser.html.gui.HtmlBlockPanel;
+import org.lobobrowser.html.gui.HtmlPanel;
+import org.lobobrowser.html.js.Window;
+import org.lobobrowser.html.test.SimpleHtmlRendererContext;
+import org.mozilla.javascript.EcmaError;
+
+public class Browser extends HtmlPanel {
+
+ protected static final Logger logger = Logger.getLogger(Browser.class.getName());
+
+ static
+ {
+ Logger.getLogger("org.lobobrowser").setLevel(Level.WARNING);
+ }
+
+ private final SimpleHtmlRendererContext rcontext;
+
+ Dimension oldSize = null;
+
+ public Browser(String uri) {
+ super();
+
+ UserAgentContext ucontext = new CacheableUserAgentContext();
+ rcontext = new SimpleHtmlRendererContext(this, ucontext);
+ addNotify();
+
+ process( uri );
+ }
+
+ private void process(String uri) {
+ try {
+ URL url;
+ try {
+ url = new URL(uri);
+ } catch (java.net.MalformedURLException mfu) {
+ int idx = uri.indexOf(':');
+ if (idx == -1 || idx == 1) {
+ // try file
+ url = new URL("file:" + uri);
+ } else {
+ throw mfu;
+ }
+ }
+ // Call SimpleHtmlRendererContext.navigate()
+ // which implements incremental rendering.
+ this.rcontext.navigate(url, null);
+ } catch (Exception err) {
+ err.printStackTrace();
+ }
+ }
+
+ @Override
+ public void setSize(final Dimension newSize)
+ {
+ if (!newSize.equals(oldSize)) {
+ oldSize = newSize;
+ super.setSize(newSize);
+ validate();
+
+ executeAsyncScript("resizeMap(" + newSize.width + "," + newSize.height + ");");
+ }
+ }
+
+ public void executeAsyncScript(final String script)
+ {
+ EventQueue.invokeLater(new Runnable() {
+ public void run() {
+ executeScript(script);
+ }
+ });
+ }
+
+ public Object executeScript(String script)
+ {
+ System.out.println("Executing script " + script);
+ try {
+ Window window = Window.getWindow(rcontext);
+ if( window.getDocumentNode() == null )
+ return null; // Document not loaded yet
+
+ return window.eval(script);
+ } catch (EcmaError ecmaError) {
+ logger.log(Level.WARNING, "Javascript error at " + ecmaError.sourceName() + ":" + ecmaError.lineNumber() + ": " + ecmaError.getMessage());
+ } catch (Throwable err) {
+ logger.log(Level.WARNING, "Unable to evaluate Javascript code", err);
+ }
+
+ return null;
+ }
+
+
+ /**
+ * Overrided to hide hardcoded scrollbars and insets
+ */
+ @Override
+ protected HtmlBlockPanel createHtmlBlockPanel(UserAgentContext ucontext, HtmlRendererContext rcontext) {
+ return new MyHtmlBlockPanel(java.awt.Color.WHITE, true, ucontext, rcontext, this);
+ }
+}
Index: applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/CacheableHttpRequest.java
===================================================================
--- applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/CacheableHttpRequest.java (revision 8748)
+++ applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/CacheableHttpRequest.java (revision 8748)
@@ -0,0 +1,324 @@
+package org.openstreetmap.josm.plugins.openLayers;
+
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.io.*;
+import java.net.*;
+import java.util.EventObject;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.lobobrowser.html.*;
+import org.lobobrowser.util.*;
+import org.lobobrowser.util.io.IORoutines;
+import org.w3c.dom.Document;
+
+/**
+ * Cacheable HTTP request
+ *
+ * This class will perform all HTTP request, caching the responses whenever possible
+ */
+public class CacheableHttpRequest implements HttpRequest {
+ private static final Logger logger = Logger.getLogger(CacheableHttpRequest.class.getName());
+
+ protected final UserAgentContext context;
+ protected final Proxy proxy;
+
+ protected boolean isAsync;
+ protected String requestMethod;
+ protected String requestUserName;
+ protected String requestPassword;
+
+ protected URL requestURL;
+ protected HttpResponse response;
+ protected int readyState;
+
+ /**
+ * The URLConnection is assigned to this field while it is
+ * ongoing.
+ */
+ protected URLConnection connection;
+
+ public CacheableHttpRequest(UserAgentContext context, Proxy proxy) {
+ this.context = context;
+ this.proxy = proxy;
+ }
+
+ public synchronized int getReadyState() {
+ return this.readyState;
+ }
+
+ public synchronized String getResponseText() {
+ if( response == null ) return null;
+
+ byte[] bytes = this.response.responseBytes;
+ String encoding = this.response.encoding;
+
+ try {
+ return bytes == null ? null : new String(bytes, encoding);
+ } catch (UnsupportedEncodingException uee) {
+ logger.log(Level.WARNING, "getResponseText(): Charset '" + encoding + "' did not work. Retrying with ISO-8859-1.", uee);
+ try {
+ return new String(bytes, "ISO-8859-1");
+ } catch (UnsupportedEncodingException uee2) {
+ // Ignore this time
+ return null;
+ }
+ }
+ }
+
+ public synchronized Document getResponseXML() {
+ if( response == null ) return null;
+
+ byte[] bytes = this.response.responseBytes;
+ if (bytes == null) return null;
+
+ InputStream in = new ByteArrayInputStream(bytes);
+ try {
+ return DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(in);
+ } catch (Exception err) {
+ logger.log(Level.WARNING, "Unable to parse response as XML.", err);
+ return null;
+ }
+ }
+
+ public synchronized byte[] getResponseBytes() {
+ if( response == null ) return null;
+ return this.response.responseBytes;
+ }
+
+ public synchronized Image getResponseImage() {
+ if( response == null ) return null;
+
+ byte[] bytes = this.response.responseBytes;
+ if (bytes == null) return null;
+
+ return Toolkit.getDefaultToolkit().createImage(bytes);
+ }
+
+ public synchronized int getStatus() {
+ if( response == null ) return 0;
+ return this.response.status;
+ }
+
+ public synchronized String getStatusText() {
+ if( response == null ) return null;
+ return this.response.statusText;
+ }
+
+ public synchronized String getAllResponseHeaders() {
+ if( response == null ) return null;
+ return this.response.responseHeaders;
+ }
+
+ public synchronized String getResponseHeader(String headerName) {
+ if( response == null ) return null;
+ Map headers = this.response.responseHeadersMap;
+ return headers == null ? null : (String) headers.get(headerName);
+ }
+
+ public void open(String method, String url) throws IOException {
+ this.open(method, url, true);
+ }
+
+ public void open(String method, URL url) throws IOException {
+ this.open(method, url, true, null, null);
+ }
+
+ public void open(String method, URL url, boolean asyncFlag) throws IOException {
+ this.open(method, url, asyncFlag, null, null);
+ }
+
+ public void open(String method, String url, boolean asyncFlag) throws IOException {
+ URL urlObj = Urls.createURL(null, url);
+ this.open(method, urlObj, asyncFlag, null);
+ }
+
+ public void open(String method, URL url, boolean asyncFlag, String userName) throws IOException {
+ this.open(method, url, asyncFlag, userName, null);
+ }
+
+ public void abort() {
+ URLConnection c;
+ synchronized (this) {
+ c = this.connection;
+ response = null;
+ }
+ if (c instanceof HttpURLConnection) {
+ ((HttpURLConnection) c).disconnect();
+ } else if (c != null) {
+ try {
+ c.getInputStream().close();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * Opens the request. Call {@link #send(String)} to complete it.
+ *
+ * @param method The request method.
+ * @param url The request URL.
+ * @param asyncFlag Whether the request should be asynchronous.
+ * @param userName The user name of the request (not supported.)
+ * @param password The password of the request (not supported.)
+ * @throws IOException If any error
+ */
+ public void open(final String method, final URL url, boolean asyncFlag, final String userName, final String password) throws IOException {
+ this.abort();
+
+ HttpResponse response = HttpResponse.lookup(url);
+ URLConnection c = null;
+
+ if( response == null )
+ {
+ c = proxy == null || proxy == Proxy.NO_PROXY ? url.openConnection() : url.openConnection(proxy);
+ response = new HttpResponse();
+ }
+
+ synchronized (this) {
+ this.connection = c;
+ this.isAsync = asyncFlag;
+ this.requestMethod = method;
+ this.requestUserName = userName;
+ this.requestPassword = password;
+ this.requestURL = url;
+ this.response = response;
+
+ if( response.loaded )
+ changeState(HttpRequest.STATE_LOADING);
+ else
+ changeState(HttpRequest.STATE_LOADING, 0, null, null);
+ }
+ }
+
+ /**
+ * Sends POST content, if any, and causes the request to proceed.
+ *
+ * In the case of asynchronous requests, a new thread is created.
+ *
+ * @param content POST content or null if there's no such
+ * content.
+ */
+ public void send(final String content) throws IOException {
+ final URL url = this.requestURL;
+ if (url == null) {
+ throw new IOException("No URL has been provided.");
+ }
+ if (this.isAsync) {
+ // Should use a thread pool instead
+ new Thread("SimpleHttpRequest-" + url.getHost()) {
+ @Override
+ public void run() {
+ try {
+ sendSync(content);
+ } catch (Throwable thrown) {
+ logger.log(Level.WARNING,"send(): Error in asynchronous request on " + url, thrown);
+ }
+ }
+ }.start();
+ } else {
+ sendSync(content);
+ }
+ }
+
+ /**
+ * This is the charset used to post data provided to {@link #send(String)}.
+ * It returns "UTF-8" unless overridden.
+ */
+ protected String getPostCharset() {
+ return "UTF-8";
+ }
+
+ /**
+ * This is a synchronous implementation of {@link #send(String)} method
+ * functionality. It may be overridden to change the behavior of the class.
+ *
+ * @param content POST content if any. It may be null.
+ * @throws IOException
+ */
+ protected void sendSync(String content) throws IOException {
+ if( response.loaded )
+ {
+ // Response from cache
+ changeState(HttpRequest.STATE_LOADED);
+ changeState(HttpRequest.STATE_INTERACTIVE);
+ changeState(HttpRequest.STATE_COMPLETE);
+ return;
+ }
+
+ try {
+ URLConnection c;
+ synchronized (this) {
+ c = this.connection;
+ }
+ c.setRequestProperty("User-Agent", this.context.getUserAgent());
+ int istatus = 0;
+ String istatusText = "";
+ InputStream err = null;
+
+ if (c instanceof HttpURLConnection) {
+ HttpURLConnection hc = (HttpURLConnection) c;
+ String method = requestMethod.toUpperCase();
+ hc.setRequestMethod(method);
+ if ("POST".equals(method) && content != null) {
+ hc.setDoOutput(true);
+ byte[] contentBytes = content.getBytes(this.getPostCharset());
+ hc.setFixedLengthStreamingMode(contentBytes.length);
+ OutputStream out = hc.getOutputStream();
+ try {
+ out.write(contentBytes);
+ } finally {
+ out.flush();
+ }
+ }
+ istatus = hc.getResponseCode();
+ istatusText = hc.getResponseMessage();
+ err = hc.getErrorStream();
+ }
+
+ response.setConnectionInfo(c);
+ changeState(HttpRequest.STATE_LOADED, istatus, istatusText, null);
+ InputStream in = err == null ? c.getInputStream() : err;
+ int contentLength = c.getContentLength();
+ changeState(HttpRequest.STATE_INTERACTIVE, istatus, istatusText, null);
+ byte[] bytes = IORoutines.load(in, contentLength == -1 ? 4096 : contentLength);
+ changeState(HttpRequest.STATE_COMPLETE, istatus, istatusText, bytes);
+ response.store(requestURL);
+ } finally {
+ synchronized (this) {
+ this.connection = null;
+ }
+ }
+ }
+
+ private final EventDispatch readyEvent = new EventDispatch();
+
+ public void addReadyStateChangeListener( final ReadyStateChangeListener listener) {
+ readyEvent.addListener(new GenericEventListener() {
+ public void processEvent(EventObject event) {
+ listener.readyStateChanged();
+ }
+ });
+ }
+
+ protected void changeState(int readyState, int status, String statusMessage, byte[] bytes) {
+ synchronized (this) {
+ this.readyState = readyState;
+ this.response.changeState(status, statusMessage, bytes);
+ }
+ readyEvent.fireEvent(null);
+ }
+
+ protected void changeState(int readyState) {
+ synchronized (this) {
+ this.readyState = readyState;
+ }
+ readyEvent.fireEvent(null);
+ }
+
+}
Index: applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/CacheableUserAgentContext.java
===================================================================
--- applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/CacheableUserAgentContext.java (revision 8748)
+++ applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/CacheableUserAgentContext.java (revision 8748)
@@ -0,0 +1,18 @@
+package org.openstreetmap.josm.plugins.openLayers;
+
+import org.lobobrowser.html.HttpRequest;
+import org.lobobrowser.html.test.SimpleUserAgentContext;
+
+/**
+ * UserAgentContext that allows request caching
+ */
+public class CacheableUserAgentContext extends SimpleUserAgentContext {
+
+ /**
+ * Returns a cache aware HttpRequest
+ */
+ @Override
+ public HttpRequest createHttpRequest() {
+ return new CacheableHttpRequest(this, this.getProxy());
+ }
+}
Index: applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/HttpResponse.java
===================================================================
--- applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/HttpResponse.java (revision 8748)
+++ applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/HttpResponse.java (revision 8748)
@@ -0,0 +1,103 @@
+/**
+ *
+ */
+package org.openstreetmap.josm.plugins.openLayers;
+
+import java.io.Serializable;
+import java.net.*;
+import java.util.List;
+import java.util.Map;
+
+import org.lobobrowser.util.Urls;
+
+/**
+ * The response from a connection
+ */
+public class HttpResponse implements Serializable {
+ private static final long serialVersionUID = -8605486951415515445L;
+
+ /** The status of the response */
+ protected int status;
+ /** The status text of the response */
+ protected String statusText;
+ /** The content of the response */
+ protected byte[] responseBytes;
+ /** The encoding of the response */
+ protected String encoding;
+ /** Whether this response has been already loaded */
+ protected boolean loaded = false;
+
+ /** Response headers are set in this map after a response is received. */
+ protected Map> responseHeadersMap;
+
+ /** Response headers are set in this string after a response is received. */
+ protected String responseHeaders;
+
+ /**
+ * Sets the information about this response: headers and encoding
+ * @param c The connection
+ */
+ public synchronized void setConnectionInfo(URLConnection c)
+ {
+ encoding = Urls.getCharset(c);
+ if (encoding == null)
+ encoding = "ISO-8859-1";
+
+ responseHeaders = getAllResponseHeaders(c);
+ responseHeadersMap = c.getHeaderFields();
+ }
+
+ /**
+ * Sets the state of this response
+ *
+ * @param status The response status
+ * @param statusMessage The status message
+ * @param bytes The response bytes
+ */
+ public synchronized void changeState(int status, String statusMessage, byte[] bytes) {
+ this.status = status;
+ this.statusText = statusMessage;
+ this.responseBytes = bytes;
+ }
+
+ /**
+ * Returns the headers of the connection as a String
+ * @param c The connection
+ * @return All the headers as a String
+ */
+ private String getAllResponseHeaders(URLConnection c) {
+ int idx = 0;
+ String value;
+ StringBuffer buf = new StringBuffer();
+ while((value = c.getHeaderField(idx)) != null) {
+ String key = c.getHeaderFieldKey(idx);
+ if( key != null )
+ {
+ buf.append(key);
+ buf.append("=");
+ }
+ buf.append(value);
+ buf.append("\n");
+ idx++;
+ }
+ return buf.toString();
+ }
+
+ /**
+ * Stores this response in cache
+ * @param requestURL The URL requested
+ */
+ public void store(URL requestURL) {
+ loaded = true;
+ StorageManager.getInstance().put(requestURL, this);
+ }
+
+ /**
+ * Looks up the requested URL in the cache
+ * @param requestURL The requested URL
+ * @return The response, if available
+ */
+ public static HttpResponse lookup(URL requestURL) {
+ return StorageManager.getInstance().get(requestURL);
+ }
+}
Index: applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/MyHtmlBlockPanel.java
===================================================================
--- applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/MyHtmlBlockPanel.java (revision 8748)
+++ applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/MyHtmlBlockPanel.java (revision 8748)
@@ -0,0 +1,50 @@
+package org.openstreetmap.josm.plugins.openLayers;
+
+import java.awt.Color;
+import java.awt.Insets;
+
+import org.lobobrowser.html.HtmlRendererContext;
+import org.lobobrowser.html.UserAgentContext;
+import org.lobobrowser.html.domimpl.NodeImpl;
+import org.lobobrowser.html.gui.HtmlBlockPanel;
+import org.lobobrowser.html.renderer.FrameContext;
+import org.lobobrowser.html.renderer.RBlock;
+
+/**
+ * Overrided class to hide hardcoded scrollbars and insets
+ */
+class MyHtmlBlockPanel extends HtmlBlockPanel {
+
+ private static final long serialVersionUID = -4778865358510293592L;
+
+ /**
+ * Constructor
+ * @param background
+ * @param opaque
+ * @param pcontext
+ * @param rcontext
+ * @param frameContext
+ */
+ public MyHtmlBlockPanel(Color background, boolean opaque, UserAgentContext pcontext, HtmlRendererContext rcontext, FrameContext frameContext) {
+ super(background, opaque, pcontext, rcontext, frameContext);
+ }
+
+ /**
+ * Override to hide hardcoded scrollbars and insets
+ */
+ @Override
+ public void setRootNode(NodeImpl node) {
+ if (node != null) {
+ RBlock block = new RBlock(node, 0, this.ucontext, this.rcontext, this.frameContext, this, RBlock.OVERFLOW_HIDDEN);
+ block.setDefaultPaddingInsets( new Insets(0, 0, 0, 0) );
+ node.setUINode(block);
+ this.rblock = block;
+ } else {
+ this.rblock = null;
+ }
+
+ this.invalidate();
+ this.validateAll();
+ this.repaint();
+ }
+}
Index: applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java
===================================================================
--- applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java (revision 8748)
+++ applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java (revision 8748)
@@ -0,0 +1,152 @@
+package org.openstreetmap.josm.plugins.openLayers;
+
+import java.awt.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.*;
+
+import org.mozilla.javascript.NativeArray;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.RenameLayerAction;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Class that displays a OpenLayers layer.
+ *
+ * @author Francisco R. Santos
+ *
+ */
+public class OpenLayersLayer extends Layer implements PreferenceChangedListener, PropertyChangeListener {
+
+ private Browser browser;
+
+ /**
+ * Creates the layer
+ */
+ public OpenLayersLayer() {
+ super("OpenLayers");
+
+ this.browser = new Browser(OpenLayersPlugin.pluginDir + "yahoo.html");
+
+ if( Main.map != null )
+ {
+ LatLon bottomLeft = Main.map.mapView.getLatLon(0,Main.map.mapView.getHeight());
+ LatLon topRight = Main.map.mapView.getLatLon(Main.map.mapView.getWidth(), 0);
+ browser.executeAsyncScript("zoomMapToExtent(" + bottomLeft.lon() + "," + bottomLeft.lat() + "," + topRight.lon() + "," + topRight.lat() + ")");
+ }
+ }
+
+ /**
+ * Draws current map onto the graphics
+ */
+ @Override
+ public void paint(Graphics g, MapView mv) {
+ setSize(Main.map.mapView.getSize());
+ browser.paint(g);
+ }
+
+ /**
+ * Sets the size of the layer
+ */
+ public void setSize(Dimension dim) {
+ browser.setSize(dim);
+ }
+
+ @Override
+ public Icon getIcon() {
+ return ImageProvider.get("OpenLayers.png");
+ }
+
+ @Override
+ public Object getInfoComponent() {
+ return null;
+ }
+
+ @Override
+ public Component[] getMenuEntries() {
+ return new Component[] {
+ new JMenuItem(new LayerListDialog.ShowHideLayerAction(this)),
+ new JMenuItem(new LayerListDialog.DeleteLayerAction(this)),
+ new JSeparator(),
+ // color,
+ new JMenuItem(new RenameLayerAction(associatedFile, this)),
+ new JSeparator(),
+ new JMenuItem(new LayerListPopup.InfoAction(this)) };
+ }
+
+ @Override
+ public String getToolTipText() {
+ return null;
+ }
+
+ @Override
+ public boolean isMergable(Layer other) {
+ return false;
+ }
+
+ @Override
+ public void mergeFrom(Layer from) {
+ }
+
+ @Override
+ public void visitBoundingBox(BoundingXYVisitor v) {
+ }
+
+ @Override
+ public void destroy() {
+ Main.pref.listener.remove(this);
+
+ if( Main.map != null )
+ Main.map.mapView.removePropertyChangeListener(this);
+
+ OpenLayersPlugin.layer = null;
+ StorageManager.flush();
+ }
+
+ public void preferenceChanged(String key, String newValue) {
+ }
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ if( !visible )
+ return;
+
+ String prop = evt.getPropertyName();
+ if ("center".equals(prop) || "scale".equals(prop)) {
+ zoomToMapView();
+ }
+ }
+
+ public void zoomToMapView()
+ {
+ LatLon bottomLeft = Main.map.mapView.getLatLon(0,Main.map.mapView.getHeight());
+ LatLon topRight = Main.map.mapView.getLatLon(Main.map.mapView.getWidth(), 0);
+ Object value = browser.executeScript("zoomMapToExtent(" + bottomLeft.lon() + "," + bottomLeft.lat() + "," + topRight.lon() + "," + topRight.lat() + ")");
+ if( value != null && false)
+ {
+ // TODO wrong calculations
+
+ // Get actual extent from browser
+ NativeArray array = (NativeArray)value;
+ double left = ((Double)array.get(0, null)).doubleValue();
+ double bottom = ((Double)array.get(1, null)).doubleValue();
+ double right = ((Double)array.get(2, null)).doubleValue();
+ double top = ((Double)array.get(3, null)).doubleValue();
+ bottomLeft = new LatLon( bottom, left );
+ topRight = new LatLon( top, right);
+
+ BoundingXYVisitor v = new BoundingXYVisitor();
+ v.visit(Main.proj.latlon2eastNorth(bottomLeft));
+ v.visit(Main.proj.latlon2eastNorth(topRight));
+ System.out.println("Recalculating position (" + left + "," + bottom + "," + right + "," + top + ")");
+ Main.map.mapView.recalculateCenterScale(v);
+ }
+ }
+}
Index: applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java
===================================================================
--- applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java (revision 8748)
+++ applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java (revision 8748)
@@ -0,0 +1,63 @@
+package org.openstreetmap.josm.plugins.openLayers;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import javax.swing.*;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.plugins.Plugin;
+
+/**
+ * Main class for the OpenLayers plugin.
+ *
+ * @author Francisco R. Santos
+ *
+ */
+public class OpenLayersPlugin extends Plugin {
+
+ static OpenLayersLayer layer;
+ static JMenu menu;
+ static String pluginDir;
+
+ public OpenLayersPlugin() {
+ pluginDir = getPluginDir();
+ try {
+ copy("/resources/yahoo.html", "yahoo.html");
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ StorageManager.initStorage( pluginDir );
+ refreshMenu();
+ }
+
+ public static void refreshMenu() {
+ JMenuBar menuBar = Main.main.menu;
+ if (menu == null) {
+ menu = new JMenu(tr("OpenLayers"));
+ menuBar.add(menu, 5);
+ } else {
+ menu.removeAll();
+ }
+
+ menu.add(new JMenuItem(new ShowOpenLayersAction("Yahoo")));
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.openstreetmap.josm.plugins.Plugin#getPreferenceSetting()
+ */
+ @Override
+ public PreferenceSetting getPreferenceSetting() {
+ return null;
+ }
+
+}
Index: applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/ShowOpenLayersAction.java
===================================================================
--- applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/ShowOpenLayersAction.java (revision 8748)
+++ applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/ShowOpenLayersAction.java (revision 8748)
@@ -0,0 +1,31 @@
+package org.openstreetmap.josm.plugins.openLayers;
+
+import java.awt.EventQueue;
+import java.awt.event.ActionEvent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+
+public class ShowOpenLayersAction extends JosmAction {
+
+ public ShowOpenLayersAction(String name) {
+ super(name, "OpenLayers", "Show layer" + name, 0, 0, false);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ final OpenLayersLayer layer = OpenLayersPlugin.layer != null ? OpenLayersPlugin.layer : new OpenLayersLayer();
+ OpenLayersPlugin.layer = layer;
+ Main.main.addLayer(layer);
+
+ EventQueue.invokeLater(new Runnable() {
+ public void run() {
+ layer.setSize(Main.map.mapView.getSize());
+ }
+ });
+
+ // Get notifications of scale and position
+ Main.map.mapView.addPropertyChangeListener("scale", layer);
+ Main.map.mapView.addPropertyChangeListener("center", layer);
+
+ }
+};
Index: applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/StorageManager.java
===================================================================
--- applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/StorageManager.java (revision 8748)
+++ applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/StorageManager.java (revision 8748)
@@ -0,0 +1,69 @@
+package org.openstreetmap.josm.plugins.openLayers;
+
+import java.net.URL;
+
+import net.sf.ehcache.*;
+import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
+
+/**
+ * Currently, this storage uses a ehcache to store objects, but as ehcache is
+ * too big, with many jars, it should be replaced for a hand-made storage to
+ * disk.
+ *
+ * @author frsantos
+ *
+ */
+public class StorageManager {
+
+ private Cache cache;
+
+ private static StorageManager storage;
+
+ public static void initStorage(String basedir)
+ {
+ if( storage != null ) storage.dispose();
+
+ storage = new StorageManager(basedir);
+ }
+
+ protected StorageManager(String basedir)
+ {
+ System.setProperty("net.sf.ehcache.enableShutdownHook", "true");
+ cache = new Cache("OpenLayers", 500, MemoryStoreEvictionPolicy.LRU, true, basedir + "cache", false, 300*24*7, 300, true, 3600*24*7, null);
+ CacheManager.getInstance().addCache(cache);
+ }
+
+ protected void dispose()
+ {
+ if( cache != null )
+ cache.dispose();
+ }
+
+ public static StorageManager getInstance()
+ {
+ return storage;
+ }
+
+ public HttpResponse get(URL key)
+ {
+ Element element = cache.get(key);
+ if( element != null )
+ return (HttpResponse)element.getObjectValue();
+
+ return null;
+ }
+
+ public void put(URL key, HttpResponse value)
+ {
+ Element element = new Element(key, value);
+ cache.put(element);
+ }
+
+ /**
+ * Flushes old data to disk
+ */
+ public static void flush() {
+ if( storage != null )
+ storage.cache.flush();
+ }
+}