Remove last traces of OPNVKarte layer

diff --git a/app/assets/images/key/opnvkarte/bus_stop13.svg b/app/assets/images/key/opnvkarte/bus_stop13.svg
deleted file mode 100644 (file)
index ae4ffee..0000000
--- a/app/assets/images/key/opnvkarte/bus_stop13.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' width='5' height='5'>
-<circle cx='2.5' cy='2.5' r='2.15' stroke='black' fill='#ffffff' />
-</svg>

diff --git a/app/assets/images/key/opnvkarte/bus_stop15.svg b/app/assets/images/key/opnvkarte/bus_stop15.svg
deleted file mode 100644 (file)
index a259919..0000000
--- a/app/assets/images/key/opnvkarte/bus_stop15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' width='9' height='9'>
-<circle cx='4.5' cy='4.5' r='4' stroke='black' fill='#ffffff' />
-</svg>

diff --git a/app/assets/images/key/opnvkarte/rail17.svg b/app/assets/images/key/opnvkarte/rail17.svg
deleted file mode 100644 (file)
index 8cada29..0000000
--- a/app/assets/images/key/opnvkarte/rail17.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' width='52' height='12' stroke='#999999' stroke-dashoffset='-1'>
-  <g stroke-dasharray='2 4'>
-    <line x2='100%' y1='1' y2='1' stroke-width='2' />
-    <line x2='100%' y1='6' y2='6' stroke-width='4' />
-    <line x2='100%' y1='11' y2='11' stroke-width='2' />
-  </g>
-  <line x2='100%' y1='2.5' y2='2.5' stroke-width='1' />
-  <line x2='100%' y1='9.5' y2='9.5' stroke-width='1' />
-</svg>

diff --git a/app/assets/images/key/opnvkarte/stop13.svg b/app/assets/images/key/opnvkarte/stop13.svg
deleted file mode 100644 (file)
index cfe65b3..0000000
--- a/app/assets/images/key/opnvkarte/stop13.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' width='5' height='5'>
-<circle cx='2.5' cy='2.5' r='2.15' stroke='black' fill='#e23148' />
-</svg>

diff --git a/app/assets/images/key/opnvkarte/stop15.svg b/app/assets/images/key/opnvkarte/stop15.svg
deleted file mode 100644 (file)
index 3ae6267..0000000
--- a/app/assets/images/key/opnvkarte/stop15.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' width='9' height='9'>
-<circle cx='4.5' cy='4.5' r='4' stroke='black' fill='#e23148' />
-</svg>

diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb
index 9a0ec07d31d85855c06a02d0179d29f7a298d207..66cd02b98b6e3199161b6baee64c24ef8a3a46e0 100644 (file)
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -37,18 +37,16 @@ window.onload = function () {
   map.attributionControl.setPrefix('');
   map.removeControl(map.attributionControl);
 
-  if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") {
-    new L.OSM.Mapnik(mapnikOptions).addTo(map);
-  } else if (args.layer === "cyclosm") {
+  if (args.layer === "cyclosm") {
     new L.OSM.CyclOSM().addTo(map);
   } else if (args.layer === "cyclemap" || args.layer === "cycle map") {
     new L.OSM.CycleMap(thunderforestOptions).addTo(map);
   } else if (args.layer === "transportmap") {
     new L.OSM.TransportMap(thunderforestOptions).addTo(map);
-  } else if (args.layer === "opnvkarte") {
-    new L.OSM.OPNVKarte().addTo(map);
   } else if (args.layer === "hot") {
     new L.OSM.HOT().addTo(map);
+  } else {
+    new L.OSM.Mapnik(mapnikOptions).addTo(map);
   }
 
   if (args.marker) {

diff --git a/config/key.yml b/config/key.yml
index a78dbb282b482a28db3f4fd81fea6ec9430c3612..dce65d53a67079fb95996a3f2999a1897cebd176 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -153,57 +153,3 @@ cyclemap:
   - { min_zoom: 15, name: bicycle_parking, image: bicycle_parking.png }
   - { min_zoom: 16, name: bicycle_parking_small, image: bicycle_parking_small.svg }
   - { min_zoom: 16, name: toilets, image: toilets.png }
-opnvkarte:
-  - { min_zoom:  6, name: rail, width: 52, height: 1, fill: "#868686" }
-  - { min_zoom:  8, name: rail, width: 52, height: 2, fill: "#868686" }
-  - { min_zoom: 11, name: rail, width: 52, height: 3, fill: "#868686", line: "#eeeeee", line-dasharray: 10, line-dashoffset: 9 }
-  - { min_zoom: 15, name: rail, width: 52, height: 4, fill: "#868686", line: "#eeeeee", line-dasharray: 10, line-dashoffset: 9, line-width: 2 }
-  - { min_zoom: 17, name: rail, image: rail17.svg }
-  - { min_zoom:  6, name: train, width: 52, height:  2, fill: "#ffc366" }
-  - { min_zoom: 10, name: train, width: 52, height:  3, fill: "#ffc366" }
-  - { min_zoom: 12, name: train, width: 52, height:  4, fill: "#ffc366" }
-  - { min_zoom: 14, name: train, width: 52, height:  8, fill: "#ffc366" }
-  - { min_zoom: 16, name: train, width: 52, height: 10, fill: "#ffc366" }
-  - { min_zoom: 10, name: light_rail, width: 52, height:  3, fill: "#66ff66" }
-  - { min_zoom: 12, name: light_rail, width: 52, height:  4, fill: "#66ff66" }
-  - { min_zoom: 14, name: light_rail, width: 52, height:  8, fill: "#66ff66" }
-  - { min_zoom: 16, name: light_rail, width: 52, height: 10, fill: "#66ff66" }
-  - { min_zoom: 10, name: tram, width: 52, height:  3, fill: "#3333fe" }
-  - { min_zoom: 12, name: tram, width: 52, height:  4, fill: "#3333fe" }
-  - { min_zoom: 14, name: tram, width: 52, height:  8, fill: "#3333fe" }
-  - { min_zoom: 16, name: tram, width: 52, height: 10, fill: "#3333fe" }
-  - { min_zoom: 10, name: subway, width: 52, height:  3, fill: "#33339f" }
-  - { min_zoom: 12, name: subway, width: 52, height:  4, fill: "#33339f" }
-  - { min_zoom: 14, name: subway, width: 52, height:  8, fill: "#33339f" }
-  - { min_zoom: 16, name: subway, width: 52, height: 10, fill: "#33339f" }
-  - { min_zoom:  9, name: ferry, width: 52, height: 2, fill: "#9f339f" }
-  - { min_zoom: 14, name: ferry, width: 52, height: 3, fill: "#9f339f" }
-  - { min_zoom: 10, name: trolleybus, width: 52, height:  3, fill: "#9f3333" }
-  - { min_zoom: 12, name: trolleybus, width: 52, height:  4, fill: "#9f3333" }
-  - { min_zoom: 14, name: trolleybus, width: 52, height:  8, fill: "#9f3333" }
-  - { min_zoom: 16, name: trolleybus, width: 52, height: 10, fill: "#9f3333" }
-  - { min_zoom: 11, name: bus, width: 52, height:  1, fill: "#fe3333" }
-  - { min_zoom: 12, name: bus, width: 52, height:  2, fill: "#fe3333" }
-  - { min_zoom: 13, name: bus, width: 52, height:  3, fill: "#fe3333" }
-  - { min_zoom: 14, name: bus, width: 52, height:  4, fill: "#fe3333" }
-  - { min_zoom: 16, name: bus, width: 52, height: 10, fill: "#fe3333" }
-  - { min_zoom: 13, name: bus_stop, image: bus_stop13.svg }
-  - { min_zoom: 15, name: bus_stop, image: bus_stop15.svg }
-  - { min_zoom: 13, name: stop, image: stop13.svg }
-  - { min_zoom: 15, name: stop, image: stop15.svg }
-  - { min_zoom:  8, name: motorway, width: 52, height:  4, fill: "#dddddd", casing: "#6d6d6d" }
-  - { min_zoom: 13, name: motorway, width: 52, height:  8, fill: "#dddddd", casing: "#6d6d6d" }
-  - { min_zoom: 15, name: motorway, width: 52, height: 13, fill: "#dddddd", casing: "#6d6d6d", line: "#ffffff", line-dasharray: 12, line-dashoffset: 4 }
-  - { min_zoom: 17, name: motorway, width: 52, height: 17, fill: "#dddddd", casing: "#6d6d6d", line: "#ffffff", line-dasharray: 12, line-dashoffset: 4, casing-width: 2 }
-  - { min_zoom:  8, name: main_road, width: 52, height:  1, fill: "#5c6d6d88" }
-  - { min_zoom: 11, name: main_road, width: 52, height:  4, fill: "#dddddd", casing: "#a1968b" }
-  - { min_zoom: 13, name: main_road, width: 52, height:  8, fill: "#dddddd", casing: "#a1968b" }
-  - { min_zoom: 15, name: main_road, width: 52, height: 13, fill: "#dddddd", casing: "#a1968b" }
-  - { min_zoom: 17, name: main_road, width: 52, height: 17, fill: "#dddddd", casing: "#a1968b" }
-  # landcover
-  - { min_zoom:  0, name: [lake, reservoir], width: 26, height: 10, fill: "#a1cbea" }
-  - { min_zoom:  8, name: [lake, reservoir], width: 26, height: 10, fill: "#bfd3ef" }
-  - { min_zoom:  4, name: [forest, wood], width: 26, height: 10, fill: "#b9c5a3" }
-  - { min_zoom:  4, name: built_up, width: 26, height: 10, fill: "#d8d8d8" }
-  - { min_zoom:  9, name: farmland, width: 26, height: 10, fill: "#eae8d6" }
-  - { min_zoom: 12, name: [park, allotments], width: 26, height: 10, fill: "#c2d89a" }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 16015d92c33ac5c40feee67686c7d3a18ec5d3c2..545e03eb0344427972f01628f125ca8736b734ce 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2383,7 +2383,6 @@ en:
           destination: "Destination access"
           construction: "Roads under construction"
           bus_stop: "Bus stop"
-          stop: "Stop"
           bicycle_shop: "Bicycle shop"
           bicycle_rental: "Bicycle rental"
           bicycle_parking: "Bicycle parking"