pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[Styles] Add Survey_Point & Shelter icon

Browse source 
adds day and night survey point & shelter icons.

requires map regeneration.
Signed-off-by: Harry Bond <endim8@pm.me>
This commit is contained in:
Harry Bond 2022-03-20 21:13:26 +00:00 • committed by Alexander Borsuk
parent 132f397ae8
commit a40b65c9c1
9 changed files with 84 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/categories.txt
View file

@ -7149,6 +7149,17 @@ el:Φάρος
sk:Maják
fa:فانوس دریایی
man_made-survey_point
en:4Survey Point|survey marker|survey benchmark|4geodetic mark|geodetic vertex|4triangulation station|4trigonometrical point|trig point|trig pillar|4trig station|trig beacon|trig
be:4Геадэзічны пункт
de:4Vermessungspunkt
el:4Γεωδαιτικό σημείο
fr:4Borne géodésique
ja:測量標
pl:4Znak geodezyjny
ru:4Геодезический пункт|Геодезический знак|4тригонометрический пункт|пункт триангуляции|тригопункт|4триангулятор
uk:4Геодезичний пункт
organic-only|organic-yes
en:4organic|bio|biological|eco|ecological|healthy
ar:بيولوجي|بيولوجي|صحي|بيولوجي|بيئي|طبيعي|عضوي

2
data/mapcss-mapping.csv
View file

@ -53,7 +53,7 @@ waterway|riverbank;52;
highway|path|bicycle;[highway=path][bicycle?];;name;int_name;53;
landuse|meadow;54;
highway|living_street;55;
deprecated|deprecated;56;x
man_made|survey_point;56;
natural|peak;57;
highway|motorway;58;
highway|steps;59;

Can't render this file because it has a wrong number of fields in line 11.

11
data/strings/types_strings.txt
View file

@ -11051,6 +11051,17 @@
uk = Просіка
zh-Hans = 树林分界线
[type.man_made.survey_point]
en = Survey Point
be = Геадэзічны пункт
de = Vermessungspunkt
el = Γεωδαιτικό σημείο
fr = Borne géodésique
ja = 測量標
pl = Znak geodezyjny
ru = Геодезический пункт
uk = Геодезичний пункт
[type.man_made.flagpole]
en = Flagpole
be = Флагшток

13
data/styles/clear/include/Icons.mapcss
View file

@ -1248,8 +1248,6 @@ area|z15-[tourism=camp_site]
node|z16-[tourism=picnic_site],
area|z16-[tourism=picnic_site],
node|z16-[amenity=shelter],
area|z16-[amenity=shelter],
node|z16-[highway=rest_area],
area|z16-[highway=rest_area]
{icon-image: picnic-m.svg;icon-min-distance: 10;}
@ -1257,6 +1255,10 @@ node|z16-[leisure=picnic_table],
area|z16-[leisure=picnic_table]
{icon-image: picnic_table-m.svg;icon-min-distance: 10;}
node|z16-[amenity=shelter],
area|z16-[amenity=shelter]
{icon-image: shelter-m.svg;icon-min-distance: 10;}
node|z16[tourism=caravan_site],
area|z16[tourism=caravan_site]
{icon-image: caravan_site-m.svg;font-size: 11;icon-min-distance: 30;}
@ -1382,6 +1384,7 @@ node|z16-[leisure=dog_park],
area|z16-[leisure=dog_park],
node|z16-[man_made=windmill],
area|z16-[man_made=windmill],
node|z16-[man_made=survey_point],
node|z17-[amenity=pharmacy],
area|z17-[amenity=pharmacy],
node|z17-[amenity=clinic],
@ -2005,7 +2008,7 @@ area|z17-[aeroway=gate]
{icon-image: gate-m.svg;font-size: 11;}
node|z18-[aeroway=gate],
area|z18-[aeroway=gate]
{icon-image: gate-m.svg;tfont-size: 11;z-index: 24200;}/*check*/
{icon-image: gate-m.svg;font-size: 11;z-index: 24200;}/*check*/
node|z17-[amenity=bureau_de_change]
{icon-image: banknote-m.svg;font-size: 11;text-optional: true;}
@ -2055,8 +2058,8 @@ node|z18-[amenity=bbq],
area|z18-[amenity=bbq]
{icon-image: bbq-m.svg;font-size: 11;-x-me-text-priority:16000;text-optional: true;}
node|z19-[man_made=survey_point]
{icon-image: survey_point-m.svg;}
node|z16-[man_made=survey_point]
{icon-image: survey_point-m.svg;font-size: 11;text-optional: true;}
/* 6. SHOP */

11
data/styles/clear/style-clear/symbols/shelter-m.svg Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<title>shelter-m</title>
<g fill="none" fill-rule="evenodd">
<g id="home-m" fill="none" fill-rule="nonzero" stroke="#717065" stroke-linecap="round" stroke-linejoin="round">
<path d="m17.786 20.842v-8.4682h-11.572v8.4682" stroke-width="1.5"/>
<path d="m12.625 2.2617-.625 2.3203zm-4.4199 3.125-.625 2.3203zm8.8398 0-.625 2.3203zm-13.262 3.9727-.625 2.3203zm17.684 0-.625 2.3203z" stroke-width=".5"/>
<path d="m3.7832 14.493 8.2168-7.3211 8.2168 7.3211" stroke-width="2"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 693 B

15
data/styles/clear/style-clear/symbols/survey_point-m.svg Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<title>survey_point-m</title>
<g fill="none" fill-rule="evenodd">
<g id="survey_point-m" fill-rule="nonzero">
<g transform="matrix(1.5049 0 0 1.5049 -6.0591 -8.1013)" fill="#717065">
<circle cx="12" cy="10.066" r="1.1503"/>
<rect x="9.3034" y="7.8647" width="5.3932" height="1.5362" rx=".75229" ry=".76811"/>
<rect x="11.45" y="10.204" width="1.1003" height="8.9832" ry=".55014"/>
<rect transform="rotate(-30)" x="4.8422" y="14.864" width="1.1003" height="8.9832" ry=".55014"/>
<rect transform="matrix(-.86603 -.5 -.5 .86603 0 0)" x="-15.942" y="2.8643" width="1.1003" height="8.9832" ry=".55014"/>
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 894 B

11
data/styles/clear/style-night/symbols/shelter-m.svg Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<title>shelter-m</title>
<g fill="none" fill-rule="evenodd">
<g id="home-m" fill="none" fill-rule="nonzero" stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" opacity="0.6">
<path d="m17.786 20.842v-8.4682h-11.572v8.4682" stroke-width="1.5"/>
<path d="m12.625 2.2617-.625 2.3203zm-4.4199 3.125-.625 2.3203zm8.8398 0-.625 2.3203zm-13.262 3.9727-.625 2.3203zm17.684 0-.625 2.3203z" stroke-width=".5"/>
<path d="m3.7832 14.493 8.2168-7.3211 8.2168 7.3211" stroke-width="2"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 704 B

15
data/styles/clear/style-night/symbols/survey_point-m.svg Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<title>survey_point-m</title>
<g fill="none" fill-rule="evenodd" opacity=".6">
<g id="survey_point-m" fill-rule="nonzero">
<g transform="matrix(1.5049,0,0,1.5049,-6.0591,-8.1013)" fill="#ffffff">
<circle cx="12" cy="10.066" r="1.1503"/>
<rect x="9.3034" y="7.8647" width="5.3932" height="1.5362" rx=".75229" ry=".76811"/>
<rect x="11.45" y="10.204" width="1.1003" height="8.9832" ry=".55014"/>
<rect transform="rotate(-30)" x="4.8422" y="14.864" width="1.1003" height="8.9832" ry=".55014"/>
<rect transform="matrix(-.86603 -.5 -.5 .86603 0 0)" x="-15.942" y="2.8643" width="1.1003" height="8.9832" ry=".55014"/>
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 907 B

1
generator/generator_tests/osm_type_test.cpp
View file

@ -1800,6 +1800,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
{"man_made", "chimney"},
{"man_made", "cutline"},
{"man_made", "lighthouse"},
{"man_made", "survey_point"},
{"man_made", "pier"},
{"man_made", "silo"},
{"man_made", "storage_tank"},