Merge branch 'master' into v2.0

2 files changed, 100 insertions, 0 deletions

diff --git a/chimere/fixtures/layers-geobretagne.json b/chimere/fixtures/layers-geobretagne.json
new file mode 100644
index 0000000..b5a406e
--- /dev/null
+++ b/chimere/fixtures/layers-geobretagne.json
@@ -0,0 +1,74 @@
+[
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.WMS(\r\n  \"Cassini - G\u00e9obretagne\", \"http://geobretagne.fr/wmsouvert\",\r\n  { layers: 'cassini', format: 'image/png', transparent:\r\nfalse},\r\n  {\r\n    attribution: \"Collection David Rumsey\",\r\n    visibility: false,\r\n    numZoomLevels:19,\r\n    projection: new OpenLayers.Projection(\"EPSG:900913\"),\r\n    displayProjection: new OpenLayers.Projection(\"EPSG:4326\"),\r\n}\r\n)\r\n",
+            "name": "Cassini - G\u00e9obretagne"
+        }
+    },
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.WMS(\r\n  \"Orthophotographie 2010 BMO - G\u00e9obretagne\", \"http://geobretagne.fr/wmsouvert\",\r\n  { layers: 'ortho-bmo-2010', format: 'image/png', transparent:\r\nfalse},\r\n  {\r\n    attribution: \"Brest Metropole Oceane - SIG - juin 2010\",\r\n    visibility: false,\r\n    numZoomLevels:19,\r\n    projection: new OpenLayers.Projection(\"EPSG:900913\"),\r\n    displayProjection: new OpenLayers.Projection(\"EPSG:4326\"),\r\n}\r\n)\r\n",
+            "name": "Orthophotographie 2010 BMO - G\u00e9obretagne"
+        }
+    },
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.WMS(\r\n  \"Orthophotographie 2010 Lannion Tregor - G\u00e9obretagne\", \"http://geobretagne.fr/wmsouvert\",\r\n  { layers: 'ortho-lanniontregor', format: 'image/png', transparent:\r\nfalse},\r\n  {\r\n    attribution: \"Lannion Tregor agglomeration\",\r\n    visibility: false,\r\n    numZoomLevels:19,\r\n    projection: new OpenLayers.Projection(\"EPSG:900913\"),\r\n    displayProjection: new OpenLayers.Projection(\"EPSG:4326\"),\r\n}\r\n)\r\n",
+            "name": "Orthophotographie 2010 Lannion Tregor - G\u00e9obretagne"
+        }
+    },
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.WMS(\r\n  \"Orthophotographie 2011 Rennes Metropole - G\u00e9obretagne\", \"http://geobretagne.fr/wmsouvert\",\r\n  { layers: 'ortho-rennesmetropole', format: 'image/png', transparent:\r\nfalse},\r\n  {\r\n    attribution: \"Rennes Métropole\",\r\n    visibility: false,\r\n    numZoomLevels:19,\r\n    projection: new OpenLayers.Projection(\"EPSG:900913\"),\r\n    displayProjection: new OpenLayers.Projection(\"EPSG:4326\"),\r\n}\r\n)\r\n",
+            "name": "Orthophotographie 2011 Rennes Metropole - G\u00e9obretagne"
+        }
+    },
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.WMS(\r\n  \"Orthophotographie 2004 BMO - G\u00e9obretagne\", \"http://geobretagne.fr/wmsouvert\",\r\n  { layers: 'ortho-bmo-2004', format: 'image/png', transparent:\r\nfalse},\r\n  {\r\n    attribution: \"Brest Metropole Oceane - SIG - Sept. 2004\",\r\n    visibility: false,\r\n    numZoomLevels:19,\r\n    projection: new OpenLayers.Projection(\"EPSG:900913\"),\r\n    displayProjection: new OpenLayers.Projection(\"EPSG:4326\"),\r\n}\r\n)\r\n",
+            "name": "Orthophotographie 2004 BMO - G\u00e9obretagne"
+        }
+    },
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.WMS(\r\n  \"Orthophotographie 2005 Cap l'Orient - G\u00e9obretagne\", \"http://geobretagne.fr/wmsouvert\",\r\n  { layers: 'ortho-caplorient', format: 'image/png', transparent:\r\nfalse},\r\n  {\r\n    attribution: \"Cap l'Orient 2005\",\r\n    visibility: false,\r\n    numZoomLevels:19,\r\n    projection: new OpenLayers.Projection(\"EPSG:900913\"),\r\n    displayProjection: new OpenLayers.Projection(\"EPSG:4326\"),\r\n}\r\n)\r\n",
+            "name": "Orthophotographie 2005 Cap l'Orient - G\u00e9obretagne"
+        }
+    },
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.WMS(\r\n  \"Orthophotographie 2008 Quimper Communauté - G\u00e9obretagne\", \"http://geobretagne.fr/wmsouvert\",\r\n  { layers: 'ortho-quimpercommunaute', format: 'image/png', transparent:\r\nfalse},\r\n  {\r\n    attribution: \"Quimper Communauté 2008\",\r\n    visibility: false,\r\n    numZoomLevels:19,\r\n    projection: new OpenLayers.Projection(\"EPSG:900913\"),\r\n    displayProjection: new OpenLayers.Projection(\"EPSG:4326\"),\r\n}\r\n)\r\n",
+            "name": "Orthophotographie 2008 Quimper Communauté - G\u00e9obretagne"
+        }
+    },
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.WMS(\r\n  \"Orthophotographie 2010 Morbihan - G\u00e9obretagne\", \"http://geobretagne.fr/wmsouvert\",\r\n  { layers: 'ortho-megalis-56', format: 'image/png', transparent:\r\nfalse},\r\n  {\r\n    attribution: \"e-Megalis - Mars 2010\",\r\n    visibility: false,\r\n    numZoomLevels:19,\r\n    projection: new OpenLayers.Projection(\"EPSG:900913\"),\r\n    displayProjection: new OpenLayers.Projection(\"EPSG:4326\"),\r\n}\r\n)\r\n",
+            "name": "Orthophotographie 2010 Morbihan - G\u00e9obretagne"
+        }
+    },
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.WMS(\r\n  \"Orthophotographie infrarouge 2010 Morbihan - G\u00e9obretagne\", \"http://geobretagne.fr/wmsouvert\",\r\n  { layers: 'ir-megalis-56', format: 'image/png', transparent:\r\nfalse},\r\n  {\r\n    attribution: \"e-Megalis - Mars 2010\",\r\n    visibility: false,\r\n    numZoomLevels:19,\r\n    projection: new OpenLayers.Projection(\"EPSG:900913\"),\r\n    displayProjection: new OpenLayers.Projection(\"EPSG:4326\"),\r\n}\r\n)\r\n",
+            "name": "Orthophotographie infrarouge 2010 Morbihan - G\u00e9obretagne"
+        }
+    }
+]
diff --git a/chimere/fixtures/layers-opencyclemap.json b/chimere/fixtures/layers-opencyclemap.json
new file mode 100644
index 0000000..5f3ef47
--- /dev/null
+++ b/chimere/fixtures/layers-opencyclemap.json
@@ -0,0 +1,26 @@
+[
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.OSM(\"OpenCycleMap - Cycle\", [\r\n                                                      'http://a.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png',\r\n                                                      'http://b.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png',\r\n                                                      'http://c.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png'],\r\n{attribution:\"Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>\"})",
+            "name": "OpenCycleMap - Cycle"
+        }
+    },
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.OSM(\"OpenCycleMap - Transport\", [\r\n                                                      'http://a.tile2.opencyclemap.org/transport/${z}/${x}/${y}.png',\r\n                                                      'http://b.tile2.opencyclemap.org/transport/${z}/${x}/${y}.png',\r\n                                                      'http://c.tile2.opencyclemap.org/transport/${z}/${x}/${y}.png'],\r\n{attribution:\"Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>\"})",
+            "name": "OpenCycleMap - Transport"
+        }
+    },
+    {
+        "pk": null,
+        "model": "chimere.layer",
+        "fields": {
+            "layer_code": "new OpenLayers.Layer.OSM(\"OpenCycleMap - Landscape\", [\r\n                                                      'http://a.tile3.opencyclemap.org/landscape/${z}/${x}/${y}.png',\r\n                                                      'http://b.tile3.opencyclemap.org/landscape/${z}/${x}/${y}.png',\r\n                                                      'http://c.tile3.opencyclemap.org/landscape/${z}/${x}/${y}.png'],\r\n{attribution:\"Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>\"})",
+            "name": "OpenCycleMap - Landscape"
+        }
+    }
+]