Merge lp:~camptocamp/geospatial-addons/6.1-swiss-topo-zoom-20130111 into lp:~geospatial-addons-core-editors/geospatial-addons/6.1

[Yannick Vaucher @ Camptocamp]

Remove degree of max zoom to avoid pixelized maps

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

 5 ,2.5] -> 5, 2.5]

Are you sure it's a "==" on line 9 (and not a "!=") ?

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Yes I'm sure about the "==" ch.swisstopo.swissimage are the only type which have a higher precision.

Other swisstopo map type like ch.swisstopo.pixelkarte-farbe haven't better precision than 1:25000

[lp:~camptocamp/geospatial-addons/6.1-swiss-topo-zoom-20130111]

89. By Yannick Vaucher @ Camptocamp on 2013-01-11

[IMP] base_geoengine - slipping coma (not sleeping coma)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

OK, I had misunderstood. It's OK for me to merge, but if you have a couple of hours more, I think there are a couple of weird assumptions made there, and some hardcoded stuff which ought to be handled differently.

I'm especially bothered by the attribute name "swisstopo_type" which look very ad hoc, and not generic enough. I don't know where this attribute is used but:

* it should be renamed to somethingelse_type
* and the information about the available resolutions should be conveyed directly in another place and not hardcoded in the javascript code.

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

review: Approve

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

@alexandre-fayolle-c2c I agree there are some improvements to do. For those, we may set them on the pipe of dev focus in 7.0. So we improve it during the migration process.

=== modified file 'base_geoengine/static/src/js/geoengine_view.js'
--- base_geoengine/static/src/js/geoengine_view.js	2012-12-21 14:29:47 +0000
+++ base_geoengine/static/src/js/geoengine_view.js	2013-01-11 18:05:25 +0000
@@ -102,6 +102,10 @@
                     );
                     break;
                 case "swisstopo":
+                    var resolutions = [4000, 3750, 3500, 3250, 3000, 2750, 2500, 2250, 2000, 1750, 1500, 1250, 1000, 750, 650, 500, 250, 100, 50, 20, 10, 5, 2.5];
+                    if (l.swisstopo_type == 'ch.swisstopo.swissimage') {
+                        resolutions.push(2, 1.5, 1, 0.5);
+                    }
                     out.push(
                         new OpenLayers.Layer.WMTS({
                             name: l.name,
@@ -110,7 +114,7 @@
                             url: ['https://wmts0.geo.admin.ch/', 'https://wmts1.geo.admin.ch/', 'https://wmts2.geo.admin.ch/'],
                             projection: 'EPSG:21781',
                             units: 'm',
-                            resolutions: [4000, 3750, 3500, 3250, 3000, 2750, 2500, 2250, 2000, 1750, 1500, 1250, 1000, 750, 650, 500, 250, 100, 50, 20, 10, 5 ,2.5, 2, 1.5, 1, 0.5],
+                            resolutions: resolutions,
                             maxExtent: [420000, 30000, 900000, 350000],
                             requestEncoding: 'REST',
                             matrixSet: '21781',