Changes from review

Signed-off-by: Kuba Mędrek <kubix.medrek@gmail.com>
organicmaps · May 9, 2024 · 65d8a82 · 65d8a82
1 parent 76aec4d
commit 65d8a82
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/data/editor.config b/data/editor.config
@@ -412,7 +412,6 @@
       </type>
       <type id="boundary-marker">
         <include field="name" />
-        <include field="ref" />
       </type>
       <!-- Too generic to be added -->
       <type id="craft" can_add="no">

diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
@@ -448,7 +448,6 @@ node|z16-[historic=wreck],
 node|z16-[historic=locomotive],
 node|z16-[historic=boundary_stone],
 area|z16-[historic=boundary_stone],
-node|z16-[boundary=marker],
 node|z16-[historic=wayside_cross],
 area|z16-[historic=wayside_cross],
 node|z16-[historic=tomb],
@@ -640,7 +639,6 @@ node|z16-[tourism=information][information=map]
 
 node|z16-[historic=boundary_stone],
 area|z16-[historic=boundary_stone],
-node|z16-[boundary=marker],
 node|z16-[historic=gallows],
 area|z16-[historic=gallows],
 node|z16-[historic=pillory],
@@ -1773,6 +1771,9 @@ node|z17-[amenity=public_bath],
 area|z17-[amenity=public_bath],
 {icon-image: public_bath-m.svg;font-size: 11;}
 
+node|z18-[boundary=marker],
+{icon-image: dot-m.svg;}
+
 /* 6. SHOP */
 
 node|z16-[amenity=marketplace],

diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -966,7 +966,6 @@ amenity-kindergarten                                # icon z17- (also has captio
 amenity-school                                      # icon z17- (also has caption(optional) z17-, area z15-)
 historic-archaeological_site                        # icon z17- (also has caption(optional) z17-)
 historic-boundary_stone                             # icon z16- (also has caption(optional) z16-)
-boundary-marker                                     # icon z16- (also has caption(optional) z16-)
 historic-gallows                                    # icon z16- (also has caption(optional) z17-)
 historic-memorial-cross                             # icon z17- (also has caption(optional) z17-)
 historic-pillory                                    # icon z16- (also has caption(optional) z17-)
@@ -1174,6 +1173,7 @@ power-station                                       # icon z17- (also has captio
 
 barrier-entrance                                    # icon z16- (also has caption(optional) z16-)
 entrance-main                                       # icon z18- (also has caption(optional) z18-)
+boundary-marker                                     # icon z16- (also has caption(optional) z18-)
 === 220
 
 historic-anchor                                     # icon z18- (also has caption(optional) z18-)
@@ -1874,7 +1874,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-school                                    # caption(optional) z17- (also has icon z17-, area z15-)
 # historic-archaeological_site                      # caption(optional) z17- (also has icon z17-)
 # historic-boundary_stone                           # caption(optional) z16- (also has icon z16-)
-# boundary-marker                                   # caption(optional) z16- (also has icon z16-)
 # historic-gallows                                  # caption(optional) z17- (also has icon z16-)
 # historic-memorial-cross                           # caption(optional) z17- (also has icon z17-)
 # historic-pillory                                  # caption(optional) z17- (also has icon z16-)

diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
@@ -359,3 +359,6 @@ node|z14-[man_made=mast],
 
 node|z18-[man_made=cairn],
 {icon-image: cairn-m.svg;text: name;text-color: @poi_label;font-size: 12;text-offset: 1;}
+
+node|z16-[boundary=marker],
+{icon-image: dot-m.svg;}
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
@@ -242,7 +242,6 @@ node|z16-[amenity=community_centre],
 area|z16-[amenity=community_centre],
 node|z16-[historic=boundary_stone],
 area|z16-[historic=boundary_stone],
-node|z16-[boundary=marker],
 node|z16-[historic=wayside_cross],
 area|z16-[historic=wayside_cross],
 node|z16-[historic=gallows],
@@ -369,7 +368,6 @@ node|z15-[tourism=viewpoint]
 
 node|z16[historic=boundary_stone],
 area|z16[historic=boundary_stone],
-node|z16[boundary=marker],
 node|z16[historic=wayside_cross],
 area|z16[historic=wayside_cross],
 node|z16[historic=gallows],
@@ -389,7 +387,6 @@ area|z16[historic=wayside_shrine]
 
 node|z17-[historic=boundary_stone],
 area|z17-[historic=boundary_stone],
-node|z17-[boundary=marker],
 node|z17-[historic=wayside_cross],
 area|z17-[historic=wayside_cross],
 node|z17-[historic=gallows],