Merge branch 'master' of https://github.com/PraxisMapper/PraxisMapper

PraxisMapper · Apr 24, 2024 · c524d33 · c524d33
2 parents 35c058b + ddcce9e
commit c524d33
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 38 deletions.
diff --git a/CoreComponents/Styles/mapTiles.cs b/CoreComponents/Styles/mapTiles.cs
@@ -57,19 +57,20 @@ public static class mapTiles
                     new StyleMatchRule() {Key="building", Value="retail|commercial", MatchType="or" },
                     new StyleMatchRule() {Key="shop", Value="*", MatchType="or" }
             }},
-            new StyleEntry() { IsGameElement = true, MatchOrder = 40, Name ="theatre", StyleSet = "mapTiles",
+            new StyleEntry() { IsGameElement = true, MatchOrder = 40, Name ="concert hall", StyleSet = "mapTiles",
                 PaintOperations = new List<StylePaint>() {
                     new StylePaint() { HtmlColorCode = "3B3B3B", FillOrStroke = "fill", LineWidthDegrees=0.0000125F, LinePattern= "solid", LayerId = 100 }
                 },
                 StyleMatchRules = new List<StyleMatchRule>() {
-                    new StyleMatchRule() { Key = "amenity", Value = "theatre", MatchType = "equals" },
+                    new StyleMatchRule() { Key = "amenity", Value = "concert hall", MatchType = "or" },
+                    new StyleMatchRule() { Key = "theatre:type", Value = "concert_hall", MatchType = "or" },
             }},
-            new StyleEntry() { IsGameElement = true, MatchOrder = 50, Name ="concert hall", StyleSet = "mapTiles",
+            new StyleEntry() { IsGameElement = true, MatchOrder = 50, Name ="theatre", StyleSet = "mapTiles",
                 PaintOperations = new List<StylePaint>() {
                     new StylePaint() { HtmlColorCode = "3B3B3B", FillOrStroke = "fill", LineWidthDegrees=0.0000125F, LinePattern= "solid", LayerId = 100 }
                 },
                 StyleMatchRules = new List<StyleMatchRule>() {
-                    new StyleMatchRule() { Key = "amenity", Value = "concert hall", MatchType = "equals" },
+                    new StyleMatchRule() { Key = "amenity", Value = "theatre", MatchType = "equals" },
             }},
             new StyleEntry() { IsGameElement = true, MatchOrder = 60, Name ="arts centre", StyleSet = "mapTiles",
                 PaintOperations = new List<StylePaint>() {

diff --git a/CoreComponents/Styles/suggestedGameplay.cs b/CoreComponents/Styles/suggestedGameplay.cs
@@ -100,19 +100,20 @@ public static class suggestedGameplay
                     new StyleMatchRule() {Key="highway", Value="path|bridleway|cycleway|footway|living_street", MatchType="any"},
                     new StyleMatchRule() { Key="footway", Value="sidewalk|crossing", MatchType="not"}
             }},
-            new StyleEntry() { IsGameElement = true, MatchOrder = 13, Name ="theatre", StyleSet = "suggestedGameplay",
+            new StyleEntry() { IsGameElement = true, MatchOrder = 13, Name ="concert hall", StyleSet = "suggestedGameplay",
                 PaintOperations = new List<StylePaint>() {
                     new StylePaint() { HtmlColorCode = "3B3B3B", FillOrStroke = "fill", LineWidthDegrees=0.0000125F, LinePattern= "solid", LayerId = 100 }
                 },
                 StyleMatchRules = new List<StyleMatchRule>() {
-                    new StyleMatchRule() { Key = "amenity", Value = "theatre", MatchType = "equals" },
+                    new StyleMatchRule() { Key = "amenity", Value = "concert hall", MatchType = "or" },
+                    new StyleMatchRule() { Key = "theatre:type", Value = "concert_hall", MatchType = "or" },
             }},
-            new StyleEntry() { IsGameElement = true, MatchOrder = 14, Name ="concert hall", StyleSet = "suggestedGameplay",
+            new StyleEntry() { IsGameElement = true, MatchOrder = 14, Name ="theatre", StyleSet = "suggestedGameplay",
                 PaintOperations = new List<StylePaint>() {
                     new StylePaint() { HtmlColorCode = "3B3B3B", FillOrStroke = "fill", LineWidthDegrees=0.0000125F, LinePattern= "solid", LayerId = 100 }
                 },
                 StyleMatchRules = new List<StyleMatchRule>() {
-                    new StyleMatchRule() { Key = "amenity", Value = "concert hall", MatchType = "equals" },
+                    new StyleMatchRule() { Key = "amenity", Value = "theatre", MatchType = "equals" },
             }},
             new StyleEntry() { IsGameElement = true, MatchOrder = 15, Name ="arts centre", StyleSet = "suggestedGameplay",
                 PaintOperations = new List<StylePaint>() {