kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[classif] Add man_made=petroleum_well

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2025-01-30 09:55:51 +03:00
parent 8f8a4449a7
commit 5e144a189a
8 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/categories.txt
View file

@ -12421,6 +12421,10 @@ vi:Tháp truyền thông
zh-Hans:通讯塔
zh-Hant:通訊塔
# Please avoid synonyms like Gas/Fuel so that Gas station search doesn't return Gas wells :)
man_made-petroleum_well
en:Petroleum well|oil|boring
organic-only|organic-yes
en:4organic|bio|biological|eco|ecological|healthy
ar:بيولوجي|بيولوجي|صحي|بيولوجي|بيئي|طبيعي|عضوي

3
data/mapcss-mapping.csv
View file

@ -583,7 +583,8 @@ area:highway|steps;470;
# ~90k usages.
amenity|telephone;471;
man_made|communications_tower;472;
deprecated|deprecated;473;x
# ~260k uses.
man_made|petroleum_well;[man_made=petroleum_well],[man_made=gas_well];;;;473;
natural|grassland;474;
deprecated|deprecated;475;x
deprecated|deprecated;476;x

Can't render this file because it contains an unexpected character in line 7 and column 16.

3
data/strings/types_strings.txt
View file

@ -18940,6 +18940,9 @@
ref = type.man_made.communications_tower
ru = Вышка связи
[type.man_made.petroleum_well]
en = Oil or gas well
[type.man_made.wastewater_plant]
en = Wastewater Treatment Plant
af = Watersuiweringsaanleg

6
data/styles/default/include/Icons.mapcss
View file

@ -1087,6 +1087,7 @@ area|z18-[amenity=public_bookcase],
node|z19-[power=substation],
area|z19-[power=substation],
node|z18-[man_made=survey_point],
node|z18-[man_made=petroleum_well],
node|z19-[emergency=fire_hydrant],
node|z19-[man_made=cairn],
{text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
@ -1566,10 +1567,15 @@ node|z15-[man_made=flagpole],
node|z16-[man_made=mast],
{icon-image: dot-m.svg;}
/* TODO: needs a better icon */
node|z16-[man_made=tower],
node|z16-[man_made=tower][tower:type=communication],
{icon-image: mast-m.svg;}
/* TODO: needs a better icon */
node|z17-[man_made=petroleum_well],
{icon-image: mast-m.svg;}
node|z16-[amenity=taxi],
area|z16-[amenity=taxi]
{icon-image: taxi-m.svg;icon-min-distance: 30;}

1
data/styles/default/include/priorities_4_overlays.prio.txt
View file

@ -1239,6 +1239,7 @@ power-generator # icon z17-
power-generator-gas # icon z17-
power-generator-hydro # icon z17-
power-generator-wind # icon z15- (also has caption(optional) z18-)
man_made-petroleum_well
=== 120
amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-)

6
data/styles/outdoors/include/Icons.mapcss
View file

@ -408,6 +408,12 @@ node|z14-[amenity=hunting_stand],
node|z16-[amenity=hunting_stand],
{font-size: 12;}
/* TODO: needs a better icon */
node|z14-[man_made=petroleum_well],
{icon-image: mast-m.svg; font-size: 11;}
node|z16-[man_made=petroleum_well],
{font-size: 12;}
node|z17-[man_made=cairn],
{icon-image: cairn-m.svg;text: name;text-color: @poi_label;font-size: 12;text-offset: 1;}

1
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View file

@ -1239,6 +1239,7 @@ power-generator # icon z17-
power-generator-gas # icon z17-
power-generator-hydro # icon z17-
power-generator-wind # icon z13- (also has caption(optional) z16-)
man_made-petroleum_well
=== 120
amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-)

3
generator/generator_tests/osm_type_test.cpp
View file

@ -2502,8 +2502,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
{"man_made", "cutline"},
{"man_made", "embankment"},
{"man_made", "lighthouse"},
{"man_made", "survey_point"},
{"man_made", "petroleum_well"},
{"man_made", "pier"},
{"man_made", "survey_point"},
{"man_made", "silo"},
{"man_made", "storage_tank"},
{"man_made", "tower"},