Geospatial Addons for OpenERP

Merge lp:~camptocamp/geospatial-addons/swisstopo-https-20121220 into lp:~geospatial-addons-core-editors/geospatial-addons/6.1

  1. swisstopo-https-20121220
  2. Merge into 6.1
Proposed by Yannick Vaucher @ Camptocamp
Status: Merged
Merged at revision: 85
Proposed branch: lp:~camptocamp/geospatial-addons/swisstopo-https-20121220
Merge into: lp:~geospatial-addons-core-editors/geospatial-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
base_geoengine/static/src/js/geoengine_view.js (+1/-1)
To merge this branch: bzr merge lp:~camptocamp/geospatial-addons/swisstopo-https-20121220
Reviewer Review Type Date Requested Status
Nicolas Bessi - Camptocamp (community) Approve
Review via email: mp+140876@code.launchpad.net

Description of the change

To avoid seeing pinky maps when using swisstopo layers if you are in a https environement

To post a comment you must log in.
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'base_geoengine/static/src/js/geoengine_view.js'
2--- base_geoengine/static/src/js/geoengine_view.js 2012-12-12 15:44:48 +0000
3+++ base_geoengine/static/src/js/geoengine_view.js 2012-12-20 11:36:21 +0000
4@@ -107,7 +107,7 @@
5 name: l.name,
6 layer: l.swisstopo_type,
7 formatSuffix: 'jpeg',
8- url: ['http://wmts0.geo.admin.ch/', 'http://wmts1.geo.admin.ch/', 'http://wmts2.geo.admin.ch/'],
9+ url: ['https://wmts0.geo.admin.ch/', 'https://wmts1.geo.admin.ch/', 'https://wmts2.geo.admin.ch/'],
10 projection: 'EPSG:21781',
11 units: 'm',
12 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],

Subscribers

People subscribed via source and target branches