[Zurich] Use new LV95/CH1903+ geocoder and base map tiles

 - Use new `getLocation95` method for geocoding addresses
 - Replace Coordinates::CH1903 with Coordinates::CH1903Plus
 - Refactor Map::Zurich to use WMTSBase instead of duplicating code
 - Slightly refactor map templates to make using custom WMTS tiles easier
 - Use correct sizes for marker pins on maps

Closes mysociety/FixMyStreet-Commercial#769.
Closes mysociety/FixMyStreet-Commercial#768.

1 files changed, 0 insertions, 128 deletions

diff --git a/web/js/OpenLayers.Projection.CH1903.js b/web/js/OpenLayers.Projection.CH1903.js
deleted file mode 100644
index 34a0500fa..000000000
--- a/web/js/OpenLayers.Projection.CH1903.js
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * OpenLayers Swiss (CH1903) grid projection transformations
- * 
- * Provides transform functions for WGS84<->CH1903 projections.
- *
- * Maths courtesy of the Swiss Federal Office of Topography:
- * http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/products/skripts.html
- * Simplifed a bit, and with x/y swapped the normal way round.
- */
-
-OpenLayers.Projection.CH1903 = {
-
-    // Convert WGS lat/long (° dec) to CH x
-    WGStoCHx: function(lat, lng) {
-
-        // Converts degrees dec to seconds
-        lat = lat * 3600;
-        lng = lng * 3600;
-
-        // Auxiliary values (% Bern)
-        var lat_aux = (lat - 169028.66) / 10000;
-        var lng_aux = (lng - 26782.5) / 10000;
-
-        // Process X
-        var x = 600072.37;
-        x = x + (211455.93 * lng_aux);
-        x = x - (10938.51 * lng_aux * lat_aux);
-        x = x - (0.36 * lng_aux * Math.pow(lat_aux, 2));
-        x = x - (44.54 * Math.pow(lng_aux, 3));
-
-        return x;
-    },
-
-    // Convert WGS lat/long (° dec) to CH y
-    WGStoCHy: function(lat, lng) {
-
-        // Converts degrees dec to seconds
-        lat = lat * 3600;
-        lng = lng * 3600;
-
-        // Auxiliary values (% Bern)
-        var lat_aux = (lat - 169028.66)/10000;
-        var lng_aux = (lng - 26782.5)/10000;
-
-        // Process Y
-        var y = 200147.07;
-        y = y + (308807.95 * lat_aux);
-        y = y + (3745.25 * Math.pow(lng_aux, 2));
-        y = y + (76.63 * Math.pow(lat_aux, 2));
-        y = y - (194.56 * Math.pow(lng_aux, 2) * lat_aux);
-        y = y + (119.79 * Math.pow(lat_aux, 3));
-
-        return y;
-      
-    },
-
-    // Convert CH x/y to WGS lat
-    chToWGSlat: function(x, y) {
-
-        // Converts militar to civil and  to unit = 1000km
-        // Axiliary values (% Bern)
-        var x_aux = (x - 600000) / 1000000;
-        var y_aux = (y - 200000) / 1000000;
-
-        // Process lat
-        var lat = 16.9023892;
-        lat = lat + (3.238272 * y_aux);
-        lat = lat - (0.270978 * Math.pow(x_aux, 2));
-        lat = lat - (0.002528 * Math.pow(y_aux, 2));
-        lat = lat - (0.0447 * Math.pow(x_aux, 2) * y_aux);
-        lat = lat - (0.0140 * Math.pow(y_aux, 3));
-
-        // Unit 10000" to 1 " and converts seconds to degrees (dec)
-        lat = lat * 100 / 36;
-
-        return lat;
-
-    },
-
-    // Convert CH x/y to WGS long
-    chToWGSlng: function(x, y) {
-
-        // Converts militar to civil and  to unit = 1000km
-        // Axiliary values (% Bern)
-        var x_aux = (x - 600000) / 1000000;
-        var y_aux = (y - 200000) / 1000000;
-
-        // Process long
-        var lng = 2.6779094;
-        lng = lng + (4.728982 * x_aux);
-        lng = lng + (0.791484 * x_aux * y_aux);
-        lng = lng + (0.1306 * x_aux * Math.pow(y_aux, 2));
-        lng = lng - (0.0436 * Math.pow(x_aux, 3));
-
-        // Unit 10000" to 1 " and converts seconds to degrees (dec)
-        lng = lng * 100 / 36;
-
-        return lng;
-
-    },
-
-    // Function to convert a WGS84 coordinate to a Swiss coordinate.
-    projectForwardSwiss: function(point) {
-        var x = OpenLayers.Projection.CH1903.WGStoCHx(point.y, point.x),
-            y = OpenLayers.Projection.CH1903.WGStoCHy(point.y, point.x);
-        point.x = x;
-        point.y = y;
-        return point;
-    },
-
-    // Function to convert a Swiss coordinate to a WGS84 coordinate. 
-    projectInverseSwiss: function(point) {
-        var lon = OpenLayers.Projection.CH1903.chToWGSlng(point.x, point.y);
-        var lat = OpenLayers.Projection.CH1903.chToWGSlat(point.x, point.y);
-        point.x = lon;
-        point.y = lat;
-        return point;
-    }
-};
-
-/**
- * Note: One transform declared
- * Transforms from EPSG:4326 to EPSG:21781
- */
- OpenLayers.Projection.addTransform("EPSG:4326", "EPSG:21781",
-    OpenLayers.Projection.CH1903.projectForwardSwiss);
- OpenLayers.Projection.addTransform("EPSG:21781", "EPSG:4326",
-    OpenLayers.Projection.CH1903.projectInverseSwiss);