Index: /applications/editors/josm/plugins/mapillary/.travis.yml
===================================================================
--- /applications/editors/josm/plugins/mapillary/.travis.yml	(revision 31393)
+++ /applications/editors/josm/plugins/mapillary/.travis.yml	(revision 31393)
@@ -0,0 +1,5 @@
+language: java
+jdk:
+  - oraclejdk8
+  - oraclejdk7
+  - openjdk7
Index: /applications/editors/josm/plugins/mapillary/build.gradle
===================================================================
--- /applications/editors/josm/plugins/mapillary/build.gradle	(revision 31393)
+++ /applications/editors/josm/plugins/mapillary/build.gradle	(revision 31393)
@@ -0,0 +1,162 @@
+apply plugin: 'eclipse'
+apply plugin: 'findbugs'
+apply plugin: 'jacoco'
+apply plugin: 'java'
+apply plugin: 'project-report'
+
+sourceCompatibility = '1.7'
+
+configurations {
+  packIntoJar
+  compile.extendsFrom packIntoJar
+}
+repositories {
+  // for JUnit
+  mavenCentral()
+  // for commons-imaging
+  maven {
+    url "https://repository.apache.org/content/repositories/snapshots/"
+  }
+  // for scribe-java
+  maven {
+    url "https://raw.github.com/fernandezpablo85/scribe-java/mvn-repo/"
+  }
+  //for josm-(latest|tested).jar
+  ivy {
+    url "https://josm.openstreetmap.de/download/"
+    layout "pattern", {
+      artifact "[artifact]-[revision].jar"
+    }
+  }
+}
+dependencies {
+  // The JOSM-version can be specified as "latest", "tested" or "snapshot-1234" (replace 1234 by the desired version numbers).
+  // For revisions older than the last ~60 versions, also append "Archiv" to the repository URL above
+  packIntoJar 'org.scribe:scribe:1.3.7'
+
+  compile 'org.openstreetmap.josm:josm:latest'
+  compile 'org.apache.commons:commons-imaging:1.0-SNAPSHOT'
+
+  testCompile 'junit:junit:4.12'
+}
+
+sourceSets {
+  main {
+    java {
+      srcDirs = ['src']
+    }
+    resources {
+      srcDirs = ["$projectDir"]
+      include 'data/**'
+      include 'images/**'
+      include 'README'
+      include 'GPL-v*.txt'
+    }
+  }
+  test {
+    java {
+      srcDirs = ['test/unit']
+    }
+    resources{
+      srcDirs = ['test/data']
+    }
+  }
+}
+
+build.dependsOn jacocoTestReport
+build.dependsOn projectReport
+
+/** Eclipse configuration */
+eclipse {
+   classpath {
+    downloadSources=true
+    downloadJavadoc=true
+  }
+}
+
+/** FindBugs configuration */
+findbugs {
+  toolVersion = "3.0.1"
+  ignoreFailures = true
+  effort = "min"
+  reportLevel = "high"
+}
+tasks.withType(FindBugs) {
+  reports {
+    xml.enabled = false
+    html.enabled = true
+  }
+}
+
+/** JaCoCo configuration */
+jacoco {
+  toolVersion = "0.7.5.201505241946"
+}
+jacocoTestReport {
+  reports {
+    xml.enabled true
+    html.destination "$buildDir/reports/jacoco"
+  }
+}
+
+test {
+  testLogging {
+    exceptionFormat "full"
+    events "started", "passed", "skipped", "failed", "standardOut", "standardError"
+  }
+}
+
+jar {
+  from zipTree(configurations.packIntoJar.singleFile)
+  manifest {
+    attributes("Plugin-Mainversion": "8433",
+               "Plugin-Version": "31331",
+               "Plugin-Class": "org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin",
+               "Plugin-Description": "Enables user to work with pictures hosted at mapillary.com",
+               "Plugin-Date": String.format("%1\$tY-%1\$tm-%1\$tdT%1\$tH:%1\$tM:%1\$tS%1\$tz", new GregorianCalendar()),
+               "Author": "nokutu <nokutu@openmailbox.org>",
+               "Plugin-Link": "https://wiki.openstreetmap.org/wiki/JOSM/Plugins/Mapillary",
+               "Plugin-Icon": "images/icon24.png",
+               "Plugin-Requires": "commons-imaging",
+               "Plugin-Canloadatruntime": "true")
+  }
+}
+
+/**
+ * The following are tasks to directly run JOSM with the freshly-built
+ * Mapillary-plugin already installed.
+ * Only prerequisite is to have JOSM (or JOSM-latest) installed on your machine.
+ * Previously installed versions of the plugin are overridden by executions of these tasks.
+ **/
+
+task installPluginToJosm(type: Copy) {
+ from "$buildDir/libs/josm-mapillary-plugin.jar"
+ into "$System.env.HOME/.josm/plugins"
+ rename '.*', 'Mapillary.jar'
+}
+installPluginToJosm.dependsOn jar
+
+task runJosm(type: Exec) {
+ commandLine 'josm'
+}
+runJosm.dependsOn installPluginToJosm
+
+task installPluginToJosmLatest(type: Copy) {
+  from "$buildDir/libs/josm-mapillary-plugin.jar"
+  into "$System.env.HOME/.josm-latest/plugins"
+  rename '.*', 'Mapillary.jar'
+}
+installPluginToJosmLatest.dependsOn jar
+
+task runJosmLatest(type: Exec) {
+  commandLine 'josm-latest'
+}
+runJosmLatest.dependsOn installPluginToJosmLatest
+
+/** Wrapper task:
+ * This only needs to be run once when the Gradle version changes.
+ * The changed files (probably in the gradle/-folder) should then be commited to CVS.
+ */
+task wrapper(type: Wrapper) {
+  gradleVersion = '2.4'
+}
Index: /applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- /applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties	(revision 31393)
+++ /applications/editors/josm/plugins/mapillary/gradle/wrapper/gradle-wrapper.properties	(revision 31393)
@@ -0,0 +1,6 @@
+#Sat Jul 04 13:19:54 CEST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.4-bin.zip
Index: /applications/editors/josm/plugins/mapillary/gradlew
===================================================================
--- /applications/editors/josm/plugins/mapillary/gradlew	(revision 31393)
+++ /applications/editors/josm/plugins/mapillary/gradlew	(revision 31393)
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
Index: /applications/editors/josm/plugins/mapillary/gradlew.bat
===================================================================
--- /applications/editors/josm/plugins/mapillary/gradlew.bat	(revision 31393)
+++ /applications/editors/josm/plugins/mapillary/gradlew.bat	(revision 31393)
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega