[SCM] jmapviewer branch, master, created. 41d21f066a98ed800f35c3cecb94d18e32652f08
The branch, master has been created at 41d21f066a98ed800f35c3cecb94d18e32652f08 (commit) - Shortlog commit 41d21f066a98ed800f35c3cecb94d18e32652f08 Author: Felix Natter Date: Sat Oct 12 09:58:48 2013 +0200 update version in man page commit 7e7497287cad90556ed668837d017b5ed44b980b Author: Felix Natter Date: Sat Oct 12 09:54:35 2013 +0200 put 'unstable' in changelog commit 613fff0333fc9fd4605397f8def0451d65c436d7 Author: Felix Natter Date: Sat Oct 12 09:51:03 2013 +0200 update debian/copyright commit 64ae0c60ed2818a71f28f63c0b16d07985634a53 Author: Felix Natter Date: Sat Oct 12 09:46:54 2013 +0200 import 1.02, remove patches that have been applied upstream commit 7bc4914efd896ac2bd85b2acf7d80f4851f8046c Merge: 9f90e56 3bff289 Author: Felix Natter Date: Sat Oct 12 09:29:33 2013 +0200 Merge tag 'upstream/1.02+dfsg1' Upstream version 1.02+dfsg1 commit 3bff28956bff8b7a981aea3d6a73520c758eb968 Author: Felix Natter Date: Sat Oct 12 09:29:32 2013 +0200 Imported Upstream version 1.02+dfsg1 commit 9f90e56eddc659848b10b7a5a198a41baa4735dd Author: Felix Natter Date: Sat Oct 12 09:25:25 2013 +0200 fix debian/watch for 1.02 (thanks to Bart Martens) commit 5997dd55be4a91b2b84eba38a7dffe18fa31a3f6 Author: Felix Natter Date: Thu Oct 3 17:53:47 2013 +0200 fix spelling error and remove 2nd authors section commit 48401ce08abf1fdd094ef4d82deffe7424dbd141 Author: Felix Natter Date: Thu Oct 3 17:47:02 2013 +0200 add basic man page for /usr/bin/jmapviewer commit bb812a323f17c8b70ad0a069222b1fb4f36abce0 Author: Felix Natter Date: Thu Oct 3 17:12:13 2013 +0200 add patch description to 02-remove-svn-prop-from-create_run_jar.patch commit cee10688f3d70516dae1188c461285836a9e275e Author: Felix Natter Date: Thu Oct 3 17:06:50 2013 +0200 Use canonical VCS URLs commit feb2bcda9e7ea66ce8b1c5c39c4738f644d4a917 Author: Felix Natter Date: Thu Oct 3 16:54:58 2013 +0200 move no-upstream-changelog override to binary lintian-overrides file commit 93650c2d07327ad68ce677b6aee1ecbd845c048b Author: Felix Natter Date: Thu Oct 3 16:52:53 2013 +0200 override two lintian binary warnings commit c34e3cbdee33c427f91dd1afa1e7ac920c153a64 Author: Felix Natter Date: Thu Oct 3 16:12:56 2013 +0200 add README.source commit 7b297cc23555a4efa4a98855ae391d550e768b83 Author: Felix Natter Date: Thu Oct 3 16:05:28 2013 +0200 update version in changelog after reimport commit 1aafe6022274e6cd5711d109b49e1d83c8fe7ec5 Author: Felix Natter Date: Thu Oct 3 16:00:53 2013 +0200 Imported Upstream version 1.0+dfsg1 commit ba49fdd4bf125506dc4fc5fea32a2168e68320a6 Merge: c4a178a 1aafe60 Author: Felix Natter Date: Thu Oct 3 16:00:53 2013 +0200 Merge tag 'upstream/1.0+dfsg1' Upstream version 1.0+dfsg1 commit c4a178ae84614283aad235e3c60e54c4d7b79645 Author: Felix Natter Date: Thu Oct 3 12:44:39 2013 +0200 remove svn stuff from debian/rules commit e7f0fbbbc19cb29684d25877d5d0455085895f85 Author: Felix Natter Date: Thu Oct 3 12:39:49 2013 +0200 call "ant clean" in clean target commit 9fcc24a9ff438d07bc0523f3abd235b76654aec9 Author: Felix Natter Date: Thu Oct 3 12:38:16 2013 +0200 remove dm-upload-allowed commit 9fccaced8ceec04a39bf14cfdfe81337081b83a6 Author: Felix Natter Date: Thu Oct 3 12:15:59 2013 +0200 adapt changelog for 1.0 commit 9a76cc594c2116dedfdc7ed61f213eb37c285ca2 Author: Felix Natter Date: Thu Oct 3 12:11:56 2013 +0200 add .pc to .gitignore commit 1863e0d72d30dec5ec2a4728b2c950fc8e404bba Author: Felix Natter Date: Thu Oct 3 12:11:05 2013 +0200 fix patches for 1.0, fix javac encoding to fix build with LANG=C commit 1cb23f4d8b933b533cc731c2fb4919b063dae5dd Merge: 700b9ad b7ff9e7 Author: Felix Natter Date: Thu Oct 3 11:59:21 2013 +0200 Merge tag 'upstream/1.0' Upstream version 1.0 commit b7ff9e7493c0a51e6ba590beec934602845b3df4 Author: Felix Natter Date: Thu Oct 3 11:59:20 2013 +0200 Imported Upstream version 1.0 commit 700b9ad3564fcd9e2aeaefc4bc65a8c50a95144b Author: Felix Natter Date: Thu Oct 3 11:54:03 2013 +0200 fix watch file / get-orig-source target commit 1ffbfeeeca125ed3c1115b5fb8b592ccaadd37b5 Author: Andrew Harvey Date: Sun Apr 14 07:36:38 2013 +1000 add lintian-overrides commit 72fe0f78459ea32847f0f866f5a3f03d95f13dee Author: Andrew Harvey Date: Sun Apr 14 07:31:25 2013 +1000 add Homepage to debian/control commit 7dbea67213bd871174ec63a03f58383b1c7e4cac Author: Andrew Harvey Date: Sun Mar 17 09:23:39 2013 +1100 clean up debian/rules commit 504a3db50e0e29c452aa60876aa9892ce3f8175c Author: Andrew Harvey Date: Sun Mar 17 09:10:01 2013 +1100 using copyright-format/1.0 and wrap lines to 80 chars commit 768638983236deccd5d84b3afa22aed42a8fc582 Author: And
[SCM] jmapviewer branch, upstream, created. 3bff28956bff8b7a981aea3d6a73520c758eb968
The branch, upstream has been created at 3bff28956bff8b7a981aea3d6a73520c758eb968 (commit) - Shortlog --- -- Java OpenStreetMap Tile Viewer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] jmapviewer branch, pristine-tar, created. 91826df5da4354025012ffa99d584bdce48489f3
The branch, pristine-tar has been created at 91826df5da4354025012ffa99d584bdce48489f3 (commit) - Shortlog commit 91826df5da4354025012ffa99d584bdce48489f3 Author: Felix Natter Date: Sat Oct 12 09:29:33 2013 +0200 pristine-tar data for jmapviewer_1.02+dfsg1.orig.tar.gz commit 007478d32099fd0477027e5c6bb90240fc31b936 Author: Felix Natter Date: Thu Oct 3 16:00:53 2013 +0200 pristine-tar data for jmapviewer_1.0+dfsg1.orig.tar.gz commit f44e599bfcf89a4818d087cde1607717e789a42d Author: Felix Natter Date: Thu Oct 3 11:59:21 2013 +0200 pristine-tar data for jmapviewer_1.0.orig.tar.gz commit 862727e01b9de2db8f23a34afa95829fb2bb9aa6 Author: Andrew Harvey Date: Fri Mar 15 19:17:16 2013 +1100 pristine-tar data for jmapviewer_0.0+svn29245+dfsg.orig.tar.gz commit 8bc545be685da491106f1a02fa89897d83167e1d Author: Andrew Harvey Date: Sat Nov 19 11:51:45 2011 +1100 pristine-tar data for jmapviewer_0.0+svn27079+dfsg.orig.tar.gz --- -- Java OpenStreetMap Tile Viewer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] jmapviewer annotated tag, upstream/1.02+dfsg1, created. upstream/1.02+dfsg1
The annotated tag, upstream/1.02+dfsg1 has been created at 4d6e2989a6cab322a917de847d771ebdb99c0bf0 (tag) tagging 3bff28956bff8b7a981aea3d6a73520c758eb968 (commit) replaces upstream/1.0+dfsg1 tagged by Felix Natter on Sat Oct 12 09:29:33 2013 +0200 - Shortlog Upstream version 1.02+dfsg1 Felix Natter (1): Imported Upstream version 1.02+dfsg1 --- -- Java OpenStreetMap Tile Viewer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] jmapviewer annotated tag, upstream/1.0, created. upstream/1.0
The annotated tag, upstream/1.0 has been created at e0d9a1cd2c56e2e97f13b1eee3b75965efbef2dc (tag) tagging b7ff9e7493c0a51e6ba590beec934602845b3df4 (commit) replaces upstream/0.0+svn29245+dfsg tagged by Felix Natter on Thu Oct 3 11:59:21 2013 +0200 - Shortlog Upstream version 1.0 Felix Natter (1): Imported Upstream version 1.0 --- -- Java OpenStreetMap Tile Viewer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] jmapviewer annotated tag, upstream/1.0+dfsg1, created. upstream/1.0+dfsg1
The annotated tag, upstream/1.0+dfsg1 has been created at 1f8502776ee606180f05cf991c3740a89fe86a3b (tag) tagging 1aafe6022274e6cd5711d109b49e1d83c8fe7ec5 (commit) replaces upstream/1.0 tagged by Felix Natter on Thu Oct 3 16:00:53 2013 +0200 - Shortlog Upstream version 1.0+dfsg1 Felix Natter (1): Imported Upstream version 1.0+dfsg1 --- -- Java OpenStreetMap Tile Viewer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] jmapviewer branch, master, updated. upstream/1.02+dfsg1-42-g43a345b
The following commit has been merged in the master branch: commit 43a345bc7bc7720d31b460c7b6d8e0ecc263113f Author: Felix Natter Date: Fri Oct 18 18:56:50 2013 +0200 Fix Maintainer and Vcs-* for pkg-osm->pkg-grass move diff --git a/debian/control b/debian/control index 25681a7..8004368 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,20 @@ Source: jmapviewer Section: utils Priority: extra -Maintainer: Debian OpenStreetMap Team +Maintainer: Debian GIS Project Uploaders: Felix Natter Build-Depends: ant, debhelper (>= 9~), default-jdk, - docbook-xsl, docbook-xml, xsltproc + docbook-xsl, + docbook-xml, + xsltproc Standards-Version: 3.9.4 Homepage: https://wiki.openstreetmap.org/wiki/JMapViewer -Vcs-Git: git://anonscm.debian.org/pkg-osm/jmapviewer.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/jmapviewer.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/jmapviewer.git +Vcs-Git: git://anonscm.debian.org/pkg-grass/jmapviewer.git Package: jmapviewer Architecture: all -- Java OpenStreetMap Tile Viewer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] jmapviewer branch, master, updated. upstream/1.02+dfsg1-43-g579b535
The following commit has been merged in the master branch: commit 579b535e89efe75ff7d638d20e673f7cbb25acc1 Author: Felix Natter Date: Sat Oct 19 20:36:33 2013 +0200 dh_auto_build: bypass svn and distribution ant targets diff --git a/debian/rules b/debian/rules index aa6747a..5328b2d 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ override_dh_auto_build: --param man.charmap.use.subset 0 \ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ debian/jmapviewer.1.xml - dh_auto_build + dh_auto_build -- build pack create_run_jar override_dh_auto_install: dh_auto_install -- Java OpenStreetMap Tile Viewer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] jmapviewer branch, master, updated. upstream/1.02+dfsg1-44-g00bb858
The following commit has been merged in the master branch: commit 00bb858c02603b15954983e0fee4e3a6b428a8ee Author: Felix Natter Date: Sat Oct 19 21:02:13 2013 +0200 use Priority: optional diff --git a/debian/control b/debian/control index 8004368..9d7e14b 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: jmapviewer Section: utils -Priority: extra +Priority: optional Maintainer: Debian GIS Project Uploaders: Felix Natter -- Java OpenStreetMap Tile Viewer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] jmapviewer branch, master, updated. upstream/1.02+dfsg1-45-ge415e85
The following commit has been merged in the master branch: commit e415e85f2ed0f95744c3b6237c54ee68350150a3 Author: Felix Natter Date: Tue Oct 22 19:03:10 2013 +0200 add Files-Excluded: in debian/copyright for removal of bing_maps.png diff --git a/debian/README.source b/debian/README.source index 568a08b..3a7225a 100644 --- a/debian/README.source +++ b/debian/README.source @@ -2,4 +2,8 @@ JMapViewer-1.0-Source.tar.gz is generated by 'get-orig-source' target. +dfsg1 suffix has been added because bing_maps.png shall be removed at import: gbp import-orig --filter bing_maps.png --filter-pristine-tar --pristine-tar -u1.0+dfsg1 \ - ../JMapViewer-1.0-Source.tar.gz \ No newline at end of file + ../JMapViewer-1.0-Source.tar.gz + +As an alternative, you can use the result of uscan (get-orig-source target), +which is also configured for removal of bing_maps.png (by means of Files-Excluded: +in debian/copyright). \ No newline at end of file diff --git a/debian/copyright b/debian/copyright index eb0e86a..95a1f90 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: JMapViewer Source: http://svn.openstreetmap.org/applications/viewer/jmapviewer +Files-Excluded: + src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png Files: * Copyright: 2008 Jan Peter Stotz and others -- Java OpenStreetMap Tile Viewer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] jmapviewer annotated tag, debian/1.02+dfsg1-1, created. debian/1.02+dfsg1-1
The annotated tag, debian/1.02+dfsg1-1 has been created at 9274fab96e03b8c8b4a42c18a5494ec4d96e6a01 (tag) tagging e415e85f2ed0f95744c3b6237c54ee68350150a3 (commit) replaces upstream/1.02+dfsg1 tagged by Felix Natter on Tue Oct 22 21:31:26 2013 +0200 - Shortlog jmapviewer Debian release 1.02+dfsg1-1 Andrew Harvey (18): Imported Debian patch 0.0+svn27079+dfsg-1 install library to /usr/share/java/ use simpler wrapper script Merge tag 'upstream/0.0+svn29245+dfsg' New upstream release add debian/watch explaining the upstream situation to fix lintian message Update standards version to 3.9.4 and debhelper to 9 fix typo in debian/copyright keep JMapViewer_Demo.jar separate from the jmapviewer.jar library add patch to use installed library in demo application fix spelling in patch descriptions Override dh_clean because it would call ant clean which fails due to the non-existent bin directory. Furthermore we debian/patches aren't applied at this point so we can't address the problem there either. update debian/compat to debhelper 9 in line with debian/control update depends to java 7 jre and drop sun-java6-jre which is no longer available using copyright-format/1.0 and wrap lines to 80 chars clean up debian/rules add Homepage to debian/control add lintian-overrides Felix Natter (27): fix watch file / get-orig-source target Merge tag 'upstream/1.0' fix patches for 1.0, fix javac encoding to fix build with LANG=C add .pc to .gitignore adapt changelog for 1.0 remove dm-upload-allowed call "ant clean" in clean target remove svn stuff from debian/rules Merge tag 'upstream/1.0+dfsg1' update version in changelog after reimport add README.source override two lintian binary warnings move no-upstream-changelog override to binary lintian-overrides file Use canonical VCS URLs add patch description to 02-remove-svn-prop-from-create_run_jar.patch add basic man page for /usr/bin/jmapviewer fix spelling error and remove 2nd authors section fix debian/watch for 1.02 (thanks to Bart Martens) Merge tag 'upstream/1.02+dfsg1' import 1.02, remove patches that have been applied upstream update debian/copyright put 'unstable' in changelog update version in man page Fix Maintainer and Vcs-* for pkg-osm->pkg-grass move dh_auto_build: bypass svn and distribution ant targets use Priority: optional add Files-Excluded: in debian/copyright for removal of bing_maps.png --- -- Java OpenStreetMap Tile Viewer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#765421: jmapviewer/josm issue
Dear GIS maintainers, since we removed bing_maps.png from jmapviewer in the Debian package, jmapviewer does not work with bing sat images in JOSM: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765421 If you agree with this patch, then I can prepare an updated package (including the patch) tomorrow and hopefully it will make it in time for jessie. Thanks and Best Regards, -- Felix Natter ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#765421: jmapviewer: Resolution for missing Bing logo
hello all,
the good news is I have received a mail from a Microsoft employee
(unfortunately late on Friday) inviting me on a call regarding
use of the Bing logo in jmapviewer.
I will make that call on Monday morning and maybe we will be able to
agree on a free license that I can put in debian/copyright and thus I
can re-include bing_maps.png
But if MS decides the logo must not be included in jmapviewer
then I'm afraid I *must* remove BingAerialTileSource.java from
jmapviewer and apply the attached patch [1] to 0.0.svn7480+dfsg1-2,
removing Bing support from JOSM. Otherwise jmapviewer may be moved to
non-free because it contains Bing support but not the logo [2].
--> can we agree on this?
[1] "dquilt import josm2.diff" should be enough before running
"gbp buildpackage".
[2] https://lists.debian.org/debian-gis/2014/10/msg00115.html
Cheers and Best Regards,
--
Felix Natter
diff --git a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
index 318257f..c597d08 100644
--- a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
@@ -150,7 +150,7 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
// never enable blacklisted entries. Do not add same imagery layer twice (fix #2519)
if (info.isBlacklisted() /*|| isLayerAlreadyPresent()*/) { // FIXME check disabled to allow several instances with different settings (see #7981)
setEnabled(false);
-} else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING || info.getImageryType() == ImageryType.SCANEX) {
+} else if (info.getImageryType() == ImageryType.TMS /*|| info.getImageryType() == ImageryType.BING*/ || info.getImageryType() == ImageryType.SCANEX) {
setEnabled(true);
} else if (Main.isDisplayingMapView() && !Main.map.mapView.getAllLayers().isEmpty()) {
setEnabled(true);
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index fce96df..82daf15 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -45,8 +45,6 @@ public class ImageryInfo implements Comparable, Attributed {
TMS("tms"),
/** An HTML proxy (previously used for Yahoo imagery) entry. **/
HTML("html"),
-/** TMS entry for Microsoft Bing. */
-BING("bing"),
/** TMS entry for Russian company https://wiki.openstreetmap.org/wiki/WikiProject_Russia/kosmosnimki";>ScanEx. **/
SCANEX("scanex"),
/** A WMS endpoint entry only stores the WMS server info, without layer, which are chosen later by the user. **/
diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java
index 91d5b6b..d1185a9 100644
--- a/src/org/openstreetmap/josm/gui/MapView.java
+++ b/src/org/openstreetmap/josm/gui/MapView.java
@@ -978,7 +978,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
layerInfo.add(i.getName());
}
for (final ImageryLayer i : getLayersOfType(ImageryLayer.class)) {
-layerInfo.add(ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" : i.getName());
+layerInfo.add(/*ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" :*/ i.getName());
}
return Utils.join("; ", layerInfo);
}
diff --git a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
index 6176e0a..737b848 100644
--- a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
@@ -152,7 +152,7 @@ public abstract class ImageryLayer extends Layer {
public static ImageryLayer create(ImageryInfo info) {
if (info.getImageryType() == ImageryType.WMS || info.getImageryType() == ImageryType.HTML)
return new WMSLayer(info);
-else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING || info.getImageryType() == ImageryType.SCANEX)
+else if (info.getImageryType() == ImageryType.TMS /*|| info.getImageryType() == ImageryType.BING*/ || info.getImageryType() == ImageryType.SCANEX)
return new TMSLayer(info);
else throw new AssertionError();
}
diff --git a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
index b940251..5a64dab 100644
--- a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
@@ -51,7 +51,6 @@ import org.openstre
Bug#765421: jmapviewer: Resolution for missing Bing logo
Sebastiaan Couwenberg writes: hi Bas, dear devs, > On 10/18/2014 12:12 PM, Felix Natter wrote: >> the good news is I have received a mail from a Microsoft employee >> (unfortunately late on Friday) inviting me on a call regarding >> use of the Bing logo in jmapviewer. >> >> I will make that call on Monday morning and maybe we will be able to >> agree on a free license that I can put in debian/copyright and thus I >> can re-include bing_maps.png > > If they license the logo under a DFSG compatible license that would be > great. And making our lives much easier. Yes. >> But if MS decides the logo must not be included in jmapviewer >> then I'm afraid I *must* remove BingAerialTileSource.java from >> jmapviewer and apply the attached patch [1] to 0.0.svn7480+dfsg1-2, >> removing Bing support from JOSM. Otherwise jmapviewer may be moved to >> non-free because it contains Bing support but not the logo [2]. > > I'm not sure that the alternative is that you *must* remove the Bing > support from jmapviewer. > > The logo referenced by the BrandLogoUri in the attribution REST-call be > fine the use instead of the bing_map.png included in jmapviewer. As > mentioned by Martin Krüger: > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765421#30 > > The Bing license says: > > " > and if the required logos and copyright notices are not > included in the service generated content, you shall add the logos and > copyright notices provided by Microsoft to the service generated content > as described in the SDKs > " > > Since the attribution REST-call includes the logo in its generated > content, downloading and using that instead of adding it in jmapviewer > itself seems to comply with the license. I thought you mean to patch josm in your last mail! Of course patching jmapviewer to download the image during build time is a good solution: wget http://dev.virtualearth.net/Branding/logo_powered_by.png -o ... --> is that what you and Martin Krüger mean? (is it even ok from a Debian point of view to download images during build?) --> If yes, then I can implement it on the weekend. If it's more complex, then I'm probably out (see below). @Bas: could you take over in this case? >> --> can we agree on this? > > In the interest of our JOSM users, doing our best to prevent the removal > of Bing support in jmapviewer should be our priority. > > Please discuss the BrandLogoUri solution with Microsoft in your call, > that seems to be the preferred solution to keep jmapviewer and its rdeps > in main, while also complying with the Bing license terms. > > While my brief tests with your patch show that JOSM works fine without > Bing support, it's a major loss of functionality. MapBox Satellite and > other freely usable satellite imagery is not on par with the Bing > imagery. I'm trying hard, but if the logo is not DFSG compliant *and* the BrandLogoUri solution is not acceptable for MS (or Debian), then I don't see any other choice but removing bing support from jmapviewer. Is *that* ok? (this issue shortly before the code freeze puts pressure on me and is beginning to have an impact on my dayjob so I need to finish this on Monday!) Best Regards, -- Felix Natter ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#765421: jmapviewer: Download bing logo via attribution XML at runtime?
Dear debian-legal and debian-gis members, I contacted map...@microsoft.com and they replied with contact details of Mr. Jalon Shoemaker. I talked to him on the phone, but he is a sales person and is only in charge of selling me licenses. I've got an email address of a more technical person at bing maps, and I will send an email to him in a few minutes. IMHO the question is: Under which license are we allowed to use http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&output=xml&key=... (the REST Service for Bing maps) at all? The license (http://www.microsoft.com/maps/product/terms.html) is pretty restrictive... (or am I missing something?) "2.Definitions. “Education or Non-Profit Organization Use” means using the Services with a Company Application that displays results for education or non-profit use, where non-profit organization means a tax exempt organization and education means use by public or private K-12 schools, universities, community colleges or other collegiate level institutions such as vocational schools, trade schools or career colleges, including their faculty, staff, and students, provided that your use is consistent with the terms of Section 5. Further your Company Application must be one of the following: publically available without restriction (for example, login or password must not be required), available only to current students of your education organization via your private network in order to provide education related services, available internally for free instructional use, or available internally for non-commercial research use. Commercially funded research projects and commercial company use for educational purposes are excluded from Education or Non-Profit Organization Use." "5. Education or Non-Profit Organization Use. Subject to your compliance with Sections 1, 2, 5 and 8 of this TOU, you may develop or host a Company Application that uses the Services to display results for Education or Non-profit Organization Use (as defined in Section 2)." => We cannot guarantee that no one uses JMapViewer (GPL) commercially... => I think we need to investigate that for jessie+1, but now I think we should parse the "attribution data" and use the included link to download the logo at runtime (many thanks to the patch [1] from Marcus Lundblad and Martin Krüger )? We should really agree on something now ;-) [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765421#60 Thanks and Best Regards, -- Felix Natter ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#765421: jmapviewer: Download bing logo via attribution XML at runtime?
Felix Natter writes: > Dear debian-legal and debian-gis members, [...] > => I think we need to investigate that for jessie+1, but now I think we > should parse the "attribution data" and use the included link to > download the logo at runtime (many thanks to the patch [1] from Marcus > Lundblad and Martin Krüger )? > We should really agree on something now ;-) --> Can we all agree on this solution for jessie? (which is probably legal if JMapViewer itself is legal) I'd suggest to apply this patch now to make sure it's fixed for jessie! Best Regards, -- Felix Natter ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] branch master updated (fd34114 -> 83a031f)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository jmapviewer. from fd34114 debian/control: use default-jre instead of openjdk-7-jre new 83a031f 1.03+dfsg-2: add patch to download Bing logo at runtime The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 9 ++ debian/patches/04-bing-logo.patch | 59 +++ debian/patches/series | 1 + 3 files changed, 69 insertions(+) create mode 100644 debian/patches/04-bing-logo.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 01/01: 1.03+dfsg-2: add patch to download Bing logo at runtime
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository jmapviewer.
commit 83a031f7d1bc6c881928a5f1a5d979396f814354
Author: Felix Natter
Date: Tue Oct 21 17:45:24 2014 +0200
1.03+dfsg-2: add patch to download Bing logo at runtime
---
debian/changelog | 9 ++
debian/patches/04-bing-logo.patch | 59 +++
debian/patches/series | 1 +
3 files changed, 69 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 01db403..3d9de00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jmapviewer (1.03+dfsg-2) unstable; urgency=medium
+
+ * Download the bing logo at runtime from the link in the
+attribution XML (thanks to Marcus Lundblad and
+Martin Krüger )
+ * Closes: #765421
+
+ -- Felix Natter Tue, 21 Oct 2014 17:39:41 +0200
+
jmapviewer (1.03+dfsg-1) unstable; urgency=medium
* New upstream version
diff --git a/debian/patches/04-bing-logo.patch
b/debian/patches/04-bing-logo.patch
new file mode 100644
index 000..87a8c01
--- /dev/null
+++ b/debian/patches/04-bing-logo.patch
@@ -0,0 +1,59 @@
+Description: Download the Bing logo when it's not installed.
+ The Bing logo is required for attribution when using the imagery, but the
+ license terms covering the image are unclear. JMapViewer is licesed under
+ the GPL, but the Bing logo is mostly likely not.
+ .
+ To not require the inclusion of the bing_maps.png file in the jmapviewer
+ package, the image is downloaded using the URL provided in the BrandLogoUri
+ attribute of the attribution response.
+ .
+Author: Marcus Lundblad & Martin Krüger
+Bug-Debian: https://bugs.debian.org/765421
+
+---
a/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
b/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
+@@ -3,6 +3,7 @@ package org.openstreetmap.gui.jmapviewer
+
+ import java.awt.Image;
+ import java.io.IOException;
++import java.io.InputStream;
+ import java.net.MalformedURLException;
+ import java.net.URL;
+ import java.util.ArrayList;
+@@ -45,6 +46,7 @@ public class BingAerialTileSource extend
+ private static final Pattern subdomainPattern =
Pattern.compile("\\{subdomain\\}");
+ private static final Pattern quadkeyPattern =
Pattern.compile("\\{quadkey\\}");
+ private static final Pattern culturePattern =
Pattern.compile("\\{culture\\}");
++private String BrandLogoUri = null;
+
+ public BingAerialTileSource() {
+ super("Bing Aerial Maps", "http://example.com/";);
+@@ -97,6 +99,9 @@ public class BingAerialTileSource extend
+ subdomains[i] = subdomainTxt.item(i).getNodeValue();
+ }
+
++XPathExpression BrandLogoUriXpath =
xpath.compile("/Response/BrandLogoUri/text()");
++this.BrandLogoUri = BrandLogoUriXpath.evaluate(document);
++
+ XPathExpression attributionXpath =
xpath.compile("Attribution/text()");
+ XPathExpression coverageAreaXpath = xpath.compile("CoverageArea");
+ XPathExpression zoomMinXpath = xpath.compile("ZoomMin/text()");
+@@ -173,8 +178,17 @@ public class BingAerialTileSource extend
+
+ @Override
+ public Image getAttributionImage() {
++ for( int i=0 ; i<5 && getAttribution()==null ; i++ ) ;
+ try {
+-return
ImageIO.read(JMapViewer.class.getResourceAsStream("images/bing_maps.png"));
++final InputStream imageResource =
JMapViewer.class.getResourceAsStream("images/bing_maps.png");
++if (imageResource != null) {
++return ImageIO.read(imageResource);
++} else {
++if (this.BrandLogoUri != null)
++return ImageIO.read(new URL(this.BrandLogoUri));
++else
++return null;
++}
+ } catch (IOException e) {
+ return null;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 32e8c24..d21e4d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-build_less.patch
03-use-installed-library-in-demo.patch
+04-bing-logo.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/jmapviewer.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#765421: jmapviewer: Download bing logo via attribution XML at runtime?
Sebastiaan Couwenberg writes: hi Bas, hi debian-gis members, > On 10/20/2014 11:17 PM, Felix Natter wrote: >> Felix Natter writes: >>> => I think we need to investigate that for jessie+1, but now I think we >>> should parse the "attribution data" and use the included link to >>> download the logo at runtime (many thanks to the patch [1] from Marcus >>> Lundblad and Martin Krüger )? >>> We should really agree on something now ;-) >> >> --> Can we all agree on this solution for jessie? >> (which is probably legal if JMapViewer itself is legal) >> >> I'd suggest to apply this patch now to make sure it's fixed for jessie! > > Yes, until we hear otherwise it seems to me the best solution to the > Bing logo license problem. > > I've cleaned up the patch a little and added DEP3 headers for inclusion > in the jmapviewer package. When the patch is forwarded upstream we have > a nice opportunity to get the upstream point of view on this issue. Thanks for your help! I pushed the change to jmapviewer git and tested with josm (and freeplane). Don Armstrong wrote: > At the very least, I'd stick a note in NEWS.Debian.gz. => Do we really want to do this? I think that problematic bing support is not quite new for this package? @Andreas: Could you sponsor this tomorrow? Cheers and Best Regards, -- Felix Natter ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 01/01: mention 'download bing logo at runtime' hack in README.Debian
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository jmapviewer. commit 33f755cad60bb567bf67c120d252642be3014c3b Author: Felix Natter Date: Tue Oct 21 20:36:58 2014 +0200 mention 'download bing logo at runtime' hack in README.Debian --- debian/README.Debian | 13 + 1 file changed, 13 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 000..93c7d77 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,13 @@ +jmapviewer +-- + +The Bing logo is required for attribution when using the imagery, but the +license terms covering the image are unclear. JMapViewer is licensed under +the GPL, but the Bing logo is mostly likely not. + +In order not to require the inclusion of the bing_maps.png file in the +jmapviewer package, the image is downloaded using the URL provided in the +BrandLogoUri attribute of the attribution response. +(see patches/04-bing-logo.patch for details) + + -- Felix Natter Tue, 21 Oct 2014 20:29:00 +0100 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] branch master updated (83a031f -> 33f755c)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository jmapviewer. from 83a031f 1.03+dfsg-2: add patch to download Bing logo at runtime new 33f755c mention 'download bing logo at runtime' hack in README.Debian The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/README.Debian | 13 + 1 file changed, 13 insertions(+) create mode 100644 debian/README.Debian -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#765421: jmapviewer: Download bing logo via attribution XML at runtime?
"Sebastiaan Couwenberg" writes: > Hi Felix, hello Bas, >> Sebastiaan Couwenberg writes: >>> On 10/20/2014 11:17 PM, Felix Natter wrote: >>>> Felix Natter writes: >>>>> => I think we need to investigate that for jessie+1, but now I think >>>>> we >>>>> should parse the "attribution data" and use the included link to >>>>> download the logo at runtime (many thanks to the patch [1] from Marcus >>>>> Lundblad and Martin Krüger >>>>> )? >>>>> We should really agree on something now ;-) >>>> >>>> --> Can we all agree on this solution for jessie? >>>> (which is probably legal if JMapViewer itself is legal) >>>> >>>> I'd suggest to apply this patch now to make sure it's fixed for jessie! >>> >>> Yes, until we hear otherwise it seems to me the best solution to the >>> Bing logo license problem. >>> >>> I've cleaned up the patch a little and added DEP3 headers for inclusion >>> in the jmapviewer package. When the patch is forwarded upstream we have >>> a nice opportunity to get the upstream point of view on this issue. >> >> Thanks for your help! I pushed the change to jmapviewer git and tested >> with josm (and freeplane). > > Do you intent to update the package with the 1.04 upstream release? > > JMapViewer 1.04 contains the patch in slightly modified form, more in line > with the upstream coding convention. I would rather not like to do this, because i.e. from 1.02 to 1.03 they introduced incompatibilies and I had to fix freeplane, and I might not have enough time to fix freeplane (and josm) before the freeze :-/ >> Don Armstrong wrote: >>> At the very least, I'd stick a note in NEWS.Debian.gz. >> >> => Do we really want to do this? I think that problematic >> bing support is not quite new for this package? > > Documenting the problems with the Bing logo is a good idea in general. > > I'm inclined to document it in README.Debian instead of in a NEWS item, > because the logo was never part of the package. But NEWS items are more > visible thanks to apt-listchanges. Ok, I added your patch description to README.Debian. >> @Andreas: Could you sponsor this tomorrow? BTW: the git repo is here: http://anonscm.debian.org/cgit/pkg-grass/jmapviewer.git > Would it make sense to sponsor the new upstream version instead of the > patches 1.03? I appreciate that you reported the patch upstream so quickly, but I would prefer to stick with 1.03 for jessie. Thanks and Best Regards, -- Felix Natter ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] branch master updated (33f755c -> 77537c5)
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a change to branch master in repository jmapviewer. from 33f755c mention 'download bing logo at runtime' hack in README.Debian new 77537c5 upgrade to standards-version 3.9.6 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[jmapviewer] 01/01: upgrade to standards-version 3.9.6
This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository jmapviewer. commit 77537c54e829ed0dce2c7290f91d6c52dd8affde Author: Felix Natter Date: Thu Oct 23 18:53:43 2014 +0200 upgrade to standards-version 3.9.6 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d9de00..a888e21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ jmapviewer (1.03+dfsg-2) unstable; urgency=medium * Download the bing logo at runtime from the link in the attribution XML (thanks to Marcus Lundblad and Martin Krüger ) - * Closes: #765421 +Closes: #765421 + * Upgrade to Standards-Version 3.9.6 -- Felix Natter Tue, 21 Oct 2014 17:39:41 +0200 diff --git a/debian/control b/debian/control index 33ee2c8..55716e5 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: docbook-xsl, docbook-xml, xsltproc -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: https://wiki.openstreetmap.org/wiki/JMapViewer Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/jmapviewer.git Vcs-Git: git://anonscm.debian.org/pkg-grass/jmapviewer.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: Bug#766508: Libjpeg trouble in jmapviewer
Andreas Tille writes: > Hi Felix, hello Andreas, > unfortunately there is some conflict in the Build-Depends: > > > 0 packages upgraded, 132 newly installed, 0 to remove and 0 not upgraded. > Need to get 62.8 MB/92.4 MB of archives. After unpacking 210 MB will be used. > The following packages have unmet dependencies: > libjpeg62-turbo : Conflicts: libjpeg62 but 1:1.3.1-8 is to be installed. > libjpeg62 : Depends: libjpeg62-turbo (= 1:1.3.1-8) but 1:1.3.1-10 is to be > installed. > Unable to resolve dependencies! Giving up... > The following NEW packages will be installed: This is a problem with installing openjdk-7-jre (which is pulled from default-jdk): https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766483 It has nothing to do with jmapviewer (except that jmapviewer depends on default-jdk). I'm not sure whether an update will already fix that problem :-( time allows maybe you should sponsor other packages and try again tomorrow? If the time until the freeze is pressing, I could ask for a workaround on debian-java. Thanks and Best Regards, -- Felix Natter ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
