Commit e1c1c247 authored by Volker Krause's avatar Volker Krause
Browse files

Add corresponding icons for all free-floating rental vehicle types

parent 0bcf774c
......@@ -191,11 +191,19 @@ LocationQueryOverlayProxyModel::Info LocationQueryOverlayProxyModel::nodeForRow(
// free floating vehicles have no matching OSM element, so no point in searching for one
info.overlayNode.id = m_data.dataSet().nextInternalId();
switch (vehicle.type()) {
case RentalVehicle::Unknown:
case RentalVehicle::Bicycle:
case RentalVehicle::Pedelec:
OSM::setTagValue(info.overlayNode, m_tagKeys.amenity, "bicycle_rental");
break;
case RentalVehicle::ElectricKickScooter:
OSM::setTagValue(info.overlayNode, m_tagKeys.amenity, "scooter_rental");
break;
default:
OSM::setTagValue(info.overlayNode, m_tagKeys.amenity, "bicycle_rental");
case RentalVehicle::ElectricMoped:
OSM::setTagValue(info.overlayNode, m_tagKeys.amenity, "motorcycle_rental");
break;
case RentalVehicle::Car:
OSM::setTagValue(info.overlayNode, m_tagKeys.amenity, "car_rental");
break;
}
OSM::setTagValue(info.overlayNode, m_tagKeys.name, loc.name().toUtf8());
......
......@@ -93,6 +93,7 @@ static constexpr const ValueMapEntry amenity_map[] = {
{ "mobile_phone", I18N_NOOP2("OSM::amenity/shop", "Mobile Phone") },
{ "money_transfer", I18N_NOOP2("OSM::amenity/shop", "Money Transfer") },
{ "motorcycle_parking", I18N_NOOP2("OSM::amenity/shop", "Motorcycle Parking") },
{ "motorcycle_rental", I18N_NOOP2("OSM::amenity/shop", "Motorcycle Rental") },
{ "museum", I18N_NOOP2("OSM::amenity/shop", "Museum") },
{ "music", I18N_NOOP2("OSM::amenity/shop", "Music") },
{ "musical_instrument", I18N_NOOP2("OSM::amenity/shop", "Musical Instruments") },
......
......@@ -116,6 +116,7 @@
<file>icons/monument.svg</file>
<file>icons/motorcycle.svg</file>
<file>icons/motorcycle_parking.svg</file>
<file>icons/motorcycle_rental.svg</file>
<file>icons/museum.svg</file>
<file>icons/music.svg</file>
<file>icons/musical_instrument.svg</file>
......
......@@ -477,10 +477,12 @@ node|z20-[vending=public_transport_tickets] {
text-color: #27ae60;
}
*|z18-[amenity=scooter_rental][mx:realtime_available>0] {
*|z18-[amenity=car_rental][mx:realtime_available>0],
*|z18-[amenity=motorcycle_rental][mx:realtime_available>0],
*|z18-[amenity=scooter_rental][mx:realtime_available>0]
{
icon-image: amenity;
icon-color: #27ae60;
text-color: #27ae60;
text: "";
}
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
width="14"
height="14"
viewBox="0 0 14 14">
<style type="text/css" id="current-color-scheme" />
<path
d="M 3.5,0 C 2.119288,0 1,1.1192881 1,2.5 1,3.8807119 2.119288,5 3.5,5 4.425342,5 5.223985,4.4972377 5.65625,3.75 H 7 l 1,-1 1,1 1,-1 1,1 h 0.5 L 13,2.5 11.5,1.25 H 5.65625 C 5.223985,0.5027623 4.425342,0 3.5,0 Z m -1,2 C 2.776142,2 3,2.2238576 3,2.5 3,2.7761424 2.776142,3 2.5,3 2.223858,3 2,2.7761424 2,2.5 2,2.2238576 2.223858,2 2.5,2 Z"
id="rental-bicycle"
class="ColorScheme-Text"
style="fill:currentColor" />
<path
id="parking-motorcycle"
class="ColorScheme-Text"
style="fill:currentColor;stroke-width:1"
d="m 11,8.5191052 c 0.253004,0.1577855 0.400522,0.3316164 0.472486,0.5519485 0.02365,0.072442 0.02515,0.087319 0.02577,0.2362444 5.7e-4,0.1370689 -0.0011,0.173015 -0.01933,0.2491296 -0.03585,0.1493889 -0.102197,0.3163088 -0.180404,0.4617483 l -0.03436,0.06658 -0.118122,0.0065 c -0.429712,0.02233 -0.775487,0.09966 -1.07598,0.242687 -0.6444792,0.306751 -1.0493015,0.883073 -1.2499407,1.776118 l -0.017187,0.07087 -0.083757,0.07731 c -0.046447,0.04191 -0.1090037,0.09231 -0.139598,0.111678 -0.2780349,0.175908 -0.6770922,0.281171 -1.2434972,0.330741 -0.2542769,0.02229 -0.4246737,0.02666 -1.2456458,0.03436 -0.481355,0.0045 -0.877792,0.01045 -0.8805421,0.01289 -0.00264,0.0024 -0.021255,0.0043 -0.040806,0.0043 -0.042621,0 -0.039707,0.0165 -0.015032,-0.180405 0.038123,-0.30433 0.033879,-0.657484 -0.010776,-0.912757 -0.128328,-0.734282 -0.5823589,-1.216353 -1.3530263,-1.436807 -0.3386022,-0.09686 -0.6365025,-0.131793 -1.1447043,-0.1396 l -0.3242975,-0.0065 -0.021475,-0.02148 C 2.1914529,9.9365883 2.1359635,9.7560069 2.1666205,9.6187016 2.1811133,9.5538579 2.2311563,9.4599627 2.2740078,9.4189695 L 3.1869147,8.4911532 c 1.9793674,-0.00627 2.5076458,0.00319 4.3984161,0.019837 0.1050342,0.024785 0.5834214,0.9830406 0.6334479,1.0625936 0.027039,0.043005 0.064558,0.1379003 0.073025,0.1846983 0.00341,0.019012 0.00715,0.034363 0.00858,0.034363 0.012733,0 0.1891638,-0.070221 0.2791961,-0.111678 C 8.8204996,9.5700276 9.1227665,9.1353068 9.2756079,8.9572325 9.4211515,7.2438173 7.0359917,2.6956091 11,8.5191074 Z m -0.09234,1.7675288 c 0.576165,-0.03977 1.143365,0.166437 1.546318,0.562688 0.560209,0.550886 0.691934,1.374476 0.328593,2.053168 -0.302115,0.56433 -0.899261,0.945274 -1.567795,1.000811 -0.250877,0.02084 -0.551612,-0.0113 -0.788193,-0.08591 C 9.8415279,13.632892 9.3861851,13.205138 9.1959661,12.661946 9.0204451,12.160734 9.08771,11.602876 9.376369,11.160728 9.7094402,10.65055 10.268904,10.330712 10.907655,10.286634 Z m -7.8411229,0.0043 c 0.2353703,2.29e-4 0.3019942,0.0069 0.4724867,0.04725 0.7687915,0.181892 1.3416158,0.778874 1.4518204,1.511955 0.020288,0.135261 0.020475,0.372491 0,0.500406 -0.097799,0.611045 -0.4982252,1.117218 -1.0910139,1.383096 -0.1880741,0.08435 -0.4243977,0.147905 -0.6378562,0.169666 -0.1226982,0.0125 -0.3867384,0.0034 -0.5154394,-0.01719 C 1.9198649,13.75383 1.2930818,13.169349 1.14652,12.393482 1.118722,12.246764 1.115357,11.977551 1.14003,11.830794 c 0.066471,-0.394619 0.2546529,-0.737493 0.5540971,-1.015845 0.2903054,-0.269858 0.6329596,-0.436984 1.0523552,-0.508997 0.074113,-0.01284 0.1384248,-0.01524 0.3200024,-0.01503 z m 7.9141429,0.620674 c -0.381009,0.01705 -0.725534,0.188579 -0.957859,0.474634 -0.072442,0.08919 -0.1697346,0.270237 -0.2018804,0.375841 -0.1307924,0.42969 -0.00385,0.874429 0.3371834,1.183363 0.08637,0.07824 0.214662,0.166839 0.307116,0.210471 0.07221,0.03409 0.221064,0.08269 0.309264,0.100944 0.109213,0.02275 0.357962,0.02958 0.466045,0.01289 0.519325,-0.08012 0.924166,-0.438274 1.043764,-0.919201 0.02746,-0.11043 0.03358,-0.326933 0.01289,-0.44027 -0.110745,-0.606464 -0.665727,-1.027804 -1.31652,-0.998669 z m -7.9098478,0.0043 c -0.2290014,-4.44e-4 -0.3951439,0.03623 -0.5863122,0.128859 -0.1331203,0.0645 -0.2305727,0.130433 -0.3350351,0.231948 -0.1715647,0.166735 -0.2752661,0.349353 -0.3307411,0.57987 -0.022894,0.09516 -0.026995,0.320991 -0.00858,0.429533 0.047338,0.279015 0.2163285,0.553152 0.4488617,0.728058 0.1789716,0.134617 0.3832253,0.221052 0.597051,0.253424 0.1059028,0.01608 0.3278414,0.01618 0.4230891,0 C 4.0331215,13.139534 4.494104,12.448956 4.2842711,11.762065 4.176015,11.407696 3.8681688,11.104978 3.4896356,10.980316 3.3446979,10.932593 3.2372852,10.916231 3.0708404,10.91589 Z"/>
</svg>
SPDX-License-Identifier: CC0-1.0
SPDX-FileCopyrightText: https://github.com/gravitystorm/openstreetmap-carto
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment