[josm-plugins] 200/369: Merge commit 'upstream/0.0.svn24572'
Bas Couwenberg
sebastic at xs4all.nl
Sat Oct 18 12:03:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit a33d8928be7a60f187083a3def641915331ce19d
Merge: 314714e dfa9415
Author: David Paleino <dapal at debian.org>
Date: Mon Dec 6 11:09:24 2010 +0100
Merge commit 'upstream/0.0.svn24572'
DirectUpload/build.xml | 2 +-
.../josm/plugins/DirectUpload/UploadDataGui.java | 242 +++---
.../plugins/DirectUpload/UploadDataGuiPlugin.java | 49 +-
.../plugins/DirectUpload/UploadOsmConnection.java | 83 ++
editgpx/.classpath | 2 +-
editgpx/.project | 2 +-
editgpx/.settings/org.eclipse.jdt.core.prefs | 260 ++++++
editgpx/.settings/org.eclipse.jdt.ui.prefs | 56 +-
editgpx/build.xml | 11 +-
.../josm/plugins/editgpx/EditGpxLayer.java | 2 +-
.../josm/plugins/editgpx/data/EditGpxData.java | 4 +-
.../josm/plugins/editgpx/data/EditGpxTrack.java | 9 +-
{editgpx => imagery}/.classpath | 4 +-
{editgpx => imagery}/.project | 9 +-
imagery/GPL-v2.0.txt | 339 ++++++++
imagery/GPL-v3.0.txt | 674 +++++++++++++++
imagery/README | 27 +
imagery/build.xml | 258 ++++++
imagery/images/OLmarker.png | Bin 0 -> 549 bytes
imagery/images/bing_maps.png | Bin 0 -> 4295 bytes
imagery/images/blankmenu.png | Bin 0 -> 1529 bytes
imagery/images/cursor/modifier/move.png | Bin 0 -> 192 bytes
imagery/images/imagery.png | Bin 0 -> 9455 bytes
imagery/images/imagery_menu.png | Bin 0 -> 1780 bytes
imagery/images/imagery_small.png | Bin 0 -> 880 bytes
imagery/images/load.png | Bin 0 -> 883 bytes
imagery/images/mapmode/adjustimg.png | Bin 0 -> 1515 bytes
imagery/images/preferences/imagery.png | Bin 0 -> 6831 bytes
imagery/images/save.png | Bin 0 -> 845 bytes
imagery/images_nodist/imagery.xcf | Bin 0 -> 17352 bytes
imagery/sources.cfg | 69 ++
.../plugins/imagery/AddImageryLayerAction.java | 25 +
.../josm/plugins/imagery/ImageryAdjustAction.java | 207 +++++
.../josm/plugins/imagery/ImageryInfo.java | 185 ++++
.../josm/plugins/imagery/ImageryLayer.java | 81 ++
.../josm/plugins/imagery/ImageryLayerInfo.java | 104 +++
.../josm/plugins/imagery/ImageryPlugin.java | 273 ++++++
.../plugins/imagery/ImageryPreferenceEditor.java | 540 ++++++++++++
.../josm/plugins/imagery/ImageryPreferences.java | 28 +
.../josm/plugins/imagery/ImageryRemoteHandler.java | 108 +++
.../plugins/imagery/tms/BingAerialTileSource.java | 191 +++++
.../josm/plugins/imagery/tms/TMSKey.java | 78 ++
.../josm/plugins/imagery/tms/TMSLayer.java | 319 +++++--
.../josm/plugins/imagery/tms/TMSPreferences.java | 82 ++
.../josm/plugins/imagery/tms/TMSTileSource.java | 22 +
.../imagery/tms/TemplatedTMSTileSource.java | 30 +
.../josm/plugins/imagery/wms/AddWMSLayerPanel.java | 530 ++++++++++++
.../josm/plugins/imagery/wms/GeorefImage.java | 248 ++++++
.../josm/plugins/imagery/wms/Grabber.java | 115 +++
.../josm/plugins/imagery/wms/HTMLGrabber.java | 46 +
.../imagery/wms/Map_Rectifier_WMSmenuAction.java | 238 ++++++
.../josm/plugins/imagery/wms/WMSAdapter.java | 40 +
.../josm/plugins/imagery/wms/WMSGrabber.java | 203 +++++
.../josm/plugins/imagery/wms}/WMSLayer.java | 111 ++-
.../josm/plugins/imagery/wms/WMSRequest.java | 102 +++
.../plugins/imagery/wms/io/WMSLayerExporter.java | 13 +
.../plugins/imagery/wms/io/WMSLayerImporter.java | 14 +
routing/build.xml | 2 +-
.../innovant/josm/plugin/routing/RoutingLayer.java | 3 +-
.../routing/gui/RoutingPreferenceDialog.java | 6 +-
slippymap/.classpath | 2 +-
slippymap/build.xml | 4 +-
slippymap/images/bing_maps.png | Bin 0 -> 4295 bytes
.../josm/plugins/slippymap/SlippyMapLayer.java | 99 ++-
.../josm/plugins/slippymap/SlippyMapPlugin.java | 135 +--
.../plugins/slippymap/SlippyMapPreferences.java | 170 +++-
svn-info.xml | 8 +-
wmsplugin/build.xml | 2 +-
wmsplugin/sources.cfg | 3 +
wmsplugin/src/wmsplugin/AddWMSLayerPanel.java | 928 ++++++++++-----------
wmsplugin/src/wmsplugin/WMSLayer.java | 8 +
wmsplugin/src/wmsplugin/WMSLayerInfo.java | 3 +-
72 files changed, 6523 insertions(+), 885 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git
More information about the Pkg-grass-devel
mailing list