Obey Russian laws

andreynovikov · Oct 30, 2023 · 0efa880 · 0efa880
1 parent 8acbc3d
commit 0efa880
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/app/src/main/assets/styles/inc_boundaries.xml b/app/src/main/assets/styles/inc_boundaries.xml
@@ -3,6 +3,13 @@
     <!-- Administrative boundaries -->
     <m cat="administrative" k="boundary" v="administrative">
         <m k="admin_level">
+            <m k="admin_level" v="2|3|4">
+                <m zoom-min="8">
+                    <line fix="true" stipple="5" stipple-ratio="0.4" stipple-stroke="#ac46ac"
+                        stroke="color:transparent" width="2.5" />
+                </m>
+            </m>
+            <!--
             <m k="admin_level" v="4">
                 <m zoom-min="8">
                     <line fix="true" stipple="5" stipple-ratio="0.4" stipple-stroke="#88ac46ac"
@@ -53,6 +60,7 @@
                     <line fix="true" stroke="#88ac46ac" width="0.6" />
                 </m>
             </m>
+            -->
         </m>
     </m>
 </rendertheme>
diff --git a/app/src/main/java/mobi/maptrek/fragments/Legend.java b/app/src/main/java/mobi/maptrek/fragments/Legend.java
@@ -982,8 +982,8 @@ public class Legend extends ListFragment {
     private static final LegendSection administrative = new LegendSection(R.string.legend_administrative, new LegendItem[]{
             country,
             state,
-            country_boundary,
-            region_boundary,
+            //country_boundary,
+            //region_boundary,
             province_boundary,
             capital,
             city,

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -283,7 +283,8 @@
     <string name="legend_state">Штат/область</string>
     <string name="legend_country_boundary">Граница государства</string>
     <string name="legend_region_boundary">Граница региона</string>
-    <string name="legend_province_boundary">Граница провинции</string>
+    <string name="x_legend_province_boundary">Граница провинции</string>
+    <string name="legend_province_boundary">Граница</string>
     <string name="legend_capital">Столица государства</string>
     <string name="legend_capital_name">Москва</string>
     <string name="legend_city">Крупный город</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -319,7 +319,8 @@
     <string name="legend_state">State</string>
     <string name="legend_country_boundary">Country boundary</string>
     <string name="legend_region_boundary">Region boundary</string>
-    <string name="legend_province_boundary">Province boundary</string>
+    <string name="x_legend_province_boundary">Province boundary</string>
+    <string name="legend_province_boundary">Boundary</string>
     <string name="legend_capital">Country capital</string>
     <string name="legend_capital_name">Moscow</string>
     <string name="legend_city">City</string>