cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pull/5196'

Browse source
This commit is contained in:
Anton Khorev 2024-09-13 11:48:38 +03:00
commit b81d645f0c
8 changed files with 3 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/images/key/opnvkarte/bus_stop13.svg
View file

@ -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>
Side by side

Before

Width:  |  Height:  |  Size: 137 B

3
app/assets/images/key/opnvkarte/bus_stop15.svg
View file

@ -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>
Side by side

Before

Width:  |  Height:  |  Size: 134 B

9
app/assets/images/key/opnvkarte/rail17.svg
View file

@ -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>
Side by side

Before

Width:  |  Height:  |  Size: 423 B

3
app/assets/images/key/opnvkarte/stop13.svg
View file

@ -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>
Side by side

Before

Width:  |  Height:  |  Size: 137 B

3
app/assets/images/key/opnvkarte/stop15.svg
View file

@ -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>
Side by side

Before

Width:  |  Height:  |  Size: 134 B

8
app/assets/javascripts/embed.js.erb
View file

@ -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) {

54
config/key.yml
View file

@ -158,57 +158,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" }

1
config/locales/en.yml
View file

@ -2384,7 +2384,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"