diff --git a/data/editor.config b/data/editor.config index 93a374c183..d59a9b02a4 100644 --- a/data/editor.config +++ b/data/editor.config @@ -444,6 +444,9 @@ + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 8ad7cd0000..2df8febfe3 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1320,3 +1320,4 @@ cuisine|moroccan;1319; cuisine|peruvian;1320; cuisine|fine_dining;1321; cuisine|tea;1322; +natural|geyser;1323; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 56cc157b66..1cdf6a290f 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -11850,6 +11850,10 @@ [type.natural.coastline] en = natural-coastline + [type.natural.geyser] + en = Geyser + ru = Гейзер + [type.natural.glacier] en = natural-glacier diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 1bb5a7ebd0..39af8603e7 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -43,6 +43,8 @@ area[amenity=fountain] {z-index: 2000;} node[natural=spring], area[natural=spring], +node[natural=geyser], +area[natural=geyser], node[amenity=drinking_water], area[amenity=drinking_water], node[man_made=water_tap], @@ -646,6 +648,8 @@ node|z13-[natural=peak], area|z13-[natural=peak], node|z14-[natural=spring], area|z14-[natural=spring], +node|z14-[natural=geyser], +area|z14-[natural=geyser], node|z16-[natural=beach], area|z16-[natural=beach] {text: name;text-color: @poi_label;text-position: center;text-offset: 1;text-optional: true;} @@ -781,6 +785,13 @@ node|z15-[natural=spring], area|z15-[natural=spring] {icon-image: drinking-water-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;text-optional: true;} +node|z14[natural=geyser], +area|z14[natural=geyser] +{icon-image: geyser-s.svg;text-offset:6;font-size: 10;icon-min-distance: 24;text-optional: true;} +node|z15-[natural=geyser], +area|z15-[natural=geyser] +{icon-image: geyser-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;text-optional: true;} + node|z15-[amenity=water_point], area|z15-[amenity=water_point], node|z15-[amenity=drinking_water], diff --git a/data/styles/clear/style-clear/symbols/geyser-l.svg b/data/styles/clear/style-clear/symbols/geyser-l.svg new file mode 100644 index 0000000000..38831f774d --- /dev/null +++ b/data/styles/clear/style-clear/symbols/geyser-l.svg @@ -0,0 +1,16 @@ + + + + light/symbols/geyser-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/geyser-m.svg b/data/styles/clear/style-clear/symbols/geyser-m.svg new file mode 100644 index 0000000000..d21cae17e9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/geyser-m.svg @@ -0,0 +1,16 @@ + + + + light/symbols/geyser-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/geyser-s.svg b/data/styles/clear/style-clear/symbols/geyser-s.svg new file mode 100644 index 0000000000..04dab39582 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/geyser-s.svg @@ -0,0 +1,16 @@ + + + + light/symbols/geyser-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/geyser-l.svg b/data/styles/clear/style-night/symbols/geyser-l.svg new file mode 100644 index 0000000000..3c55cea86c --- /dev/null +++ b/data/styles/clear/style-night/symbols/geyser-l.svg @@ -0,0 +1,16 @@ + + + + dark/symbols/geyser-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/geyser-m.svg b/data/styles/clear/style-night/symbols/geyser-m.svg new file mode 100644 index 0000000000..540cb393ad --- /dev/null +++ b/data/styles/clear/style-night/symbols/geyser-m.svg @@ -0,0 +1,16 @@ + + + + dark/symbols/geyser-m + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/geyser-s.svg b/data/styles/clear/style-night/symbols/geyser-s.svg new file mode 100644 index 0000000000..ba957aa65c --- /dev/null +++ b/data/styles/clear/style-night/symbols/geyser-s.svg @@ -0,0 +1,16 @@ + + + + dark/symbols/geyser-s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/ugc_types.csv b/data/ugc_types.csv index b1cb51a393..e7b6fb42ae 100644 --- a/data/ugc_types.csv +++ b/data/ugc_types.csv @@ -70,6 +70,7 @@ leisure-water_park,1,1,0,experience service value_for_money man_made-lighthouse,1,1,0,experience value_for_money natural-beach,1,1,0,experience cleanliness crowdedness natural-cave_entrance,1,1,0,experience cleanliness crowdedness +natural-geyser,1,1,0,rating natural-peak,1,1,0,rating natural-spring,1,1,0,rating natural-volcano,1,1,0,rating