drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-07 13:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[editor] Support complex POI types in the editor (#2855)

Browse Source 
Signed-off-by: map-per <map-per@gmx.de>
This commit is contained in:
map-per
2025-12-13 16:14:22 +01:00
parent 3511dbb692
commit c1760bbc37
10 changed files with 485 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
data/editor.config
View File

@@ -394,32 +394,25 @@
<type id="amenity-pharmacy" group="shop">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-buddhist" can_add="no">
<type id="amenity-place_of_worship-buddhist">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-christian" can_add="no">
<type id="amenity-place_of_worship-christian">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-hindu" can_add="no">
<type id="amenity-place_of_worship-hindu">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-jewish" can_add="no">
<type id="amenity-place_of_worship-jewish">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-muslim" can_add="no">
<type id="amenity-place_of_worship-muslim">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-shinto" can_add="no">
<type id="amenity-place_of_worship-shinto">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-taoist" can_add="no">
<type id="amenity-place_of_worship-taoist">
<include group="poi_internet" />
</type>
<type id="amenity-place_of_worship">
@@ -705,6 +698,9 @@
<type id="leisure-resort">
<include group="poi_internet" />
</type>
<type id="leisure-sports_centre-sport-swimming">
<include group="poi_internet" />
</type>
<type id="leisure-sports_centre">
<include group="poi_internet" />
</type>
@@ -1115,6 +1111,7 @@
<type id="tourism-artwork">
<include field="name" />
</type>
<!-- Not addable because OSM category is too broad and due to vandalism problems -->
<type id="tourism-attraction" can_add="no">
<include group="poi_internet" />
<!-- <include field="wikipedia" />-->
@@ -1144,26 +1141,22 @@
<include group="poi_internet" />
<include field="self_service" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="tourism-information-office" can_add="no">
<type id="tourism-information-office">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="tourism-information-visitor_centre" can_add="no">
<type id="tourism-information-visitor_centre">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="tourism-information-board" can_add="no">
<type id="tourism-information-board">
<include field="name" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="tourism-information-map" can_add="no">
<type id="tourism-information-map">
<include field="name" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="tourism-information-guidepost" can_add="no">
<type id="tourism-information-guidepost">
</type>
<type id="tourism-information">
<!-- Too generic to add -->
<type id="tourism-information" can_add="no">
<include group="poi" />
</type>
<type id="amenity-ranger_station">
@@ -1509,67 +1502,50 @@
<type id="leisure-escape_game">
<include group="poi_internet" />
</type>
<!-- Uncomment this after our editor core supports complex types
<type id="amenity-vending_machine-parking_tickets">
<include field="operator" />
<include field="level" />
</type>
<type id="amenity-vending_machine-public_transport">
<include field="operator" />
<include field="level" />
</type>
<type id="amenity-vending_machine-cigarettes">
<tag k="amenity" v="vending_machine" />
<tag k="vending" v="cigarettes" />
<include field="operator" />
</type>
<type id="amenity-vending_machine-coffee">
<tag k="amenity" v="vending_machine" />
<tag k="vending" v="coffee" />
<include field="operator" />
</type>
<type id="amenity-vending_machine-condoms">
<tag k="amenity" v="vending_machine" />
<tag k="vending" v="condoms" />
<include field="operator" />
<include field="level" />
</type>
<type id="amenity-vending_machine-drinks">
<tag k="amenity" v="vending_machine" />
<tag k="vending" v="drinks" />
<include field="operator" />
<include field="level" />
</type>
<type id="amenity-vending_machine-excrement_bags">
<include field="operator" />
<include field="level" />
</type>
<type id="amenity-vending_machine-coffee">
<include field="operator" />
<include field="level" />
</type>
<type id="amenity-vending_machine-condoms">
<include field="operator" />
<include field="level" />
</type>
<type id="amenity-vending_machine-food">
<tag k="amenity" v="vending_machine" />
<tag k="vending" v="food" />
<include field="operator" />
<include field="level" />
</type>
<type id="amenity-vending_machine-newspapers">
<tag k="amenity" v="vending_machine" />
<tag k="vending" v="newspapers" />
<include field="operator" />
<include field="level" />
</type>
<type id="amenity-vending_machine-sweets">
<tag k="amenity" v="vending_machine" />
<tag k="vending" v="sweets" />
<include field="operator" />
<include field="level" />
</type>
<type id="shop-car_repair-tyres">
<tag k="shop" v="car_repair" />
<tag k="service" v="tyres" />
<include group="poi_internet" />
<type id="amenity-vending_machine">
<include field="operator" />
<include field="level" />
</type>
<type id="leisure-sports_centre-climbing">
<tag k="leisure" v="sports_centre" />
<tag k="sport" v="climbing" />
<include group="poi_internet" />
</type>
<type id="leisure-sports_centre-shooting">
<tag k="leisure" v="sports_centre" />
<tag k="sport" v="shooting" />
<include group="poi_internet" />
</type>
<type id="leisure-sports_centre-swimming">
<tag k="leisure" v="sports_centre" />
<tag k="sport" v="swimming" />
<include group="poi_internet" />
</type>
<type id="leisure-sports_centre-yoga">
<tag k="leisure" v="sports_centre" />
<tag k="sport" v="yoga" />
<include group="poi_internet" />
</type-->
<!-- Not addable as mapping as a node is uncommon -->
<type id="natural-beach" can_add="no">
<include field="name" />

4
data/mapcss-mapping.csv
View File

@@ -5,7 +5,7 @@
# highway|bus_stop;[highway=bus_stop];;name;int_name;22;
# It contains:
# - type name: "highway|bus_stop" ("|" is converted to "-" internally)
# - mapcss selectors for tags: "[highway=bus_stop]", multiple selectors are separated with commas
# - mapcss selectors for tags: "[highway=bus_stop]", multiple selectors are separated with commas, best practice tagging for OSM editor is listed first
# - "x" for a deprecated type or an empty cell otherwise
# - primary title tag (usually "name")
# - secondary title tag (usually "int_name")
@@ -626,7 +626,7 @@ highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504;
drinking_water|no;505;
amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
amenity|flight_school;[amenity=sailing_school],[education=flight_school];;name;int_name;507;
amenity|flight_school;[amenity=flight_school],[education=flight_school];;name;int_name;507;
amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508;
amenity|car_pooling;509;
social_facility|soup_kitchen;510;
Can't render this file because it contains an unexpected character in line 7 and column 16.