[fdroid] Release version 2025.06.10-4

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

android/app/src/fdroid/play/listings/tr-TR/full-description.txt

@@ -1 +0,0 @@
-Gönüllüler tarafından yürütülen, OpenStreetMap harita verisini kullanan, şeffaf, mahremiyete saygılı, kamu yararına olma kararlılığıyla güçlendirilmiş bir özgür yazılım.

android/app/src/fdroid/play/listings/tr-TR/short-description.txt

@@ -1 +0,0 @@
-Kolayca gezinin - Seyahatinizde keşfe çıkın - Gönüllüler tarafından yapıldı

android/app/src/fdroid/play/listings/tr-TR/title.txt

@@ -1 +0,0 @@
-CoMaps - İnternetsiz Seyahat Edin

android/app/src/fdroid/play/version.yaml

@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.06.10-4-FDroid+25061004

android/app/src/google/play/listings/tr-TR/short-description.txt

@@ -1 +0,0 @@
-Kolayca gezinin - Seyahatinizde keşfe çıkın - Gönüllüler tarafından yapıldı

android/app/src/google/play/listings/tr-TR/title.txt

@@ -1 +0,0 @@
-CoMaps - Mahremiyetli Seyahat

android/app/src/main/java/app/organicmaps/MwmActivity.java

@@ -34,6 +34,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.annotation.UiThread;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
@@ -119,8 +120,6 @@ import app.organicmaps.widget.menu.MainMenu;
 import app.organicmaps.widget.placepage.PlacePageController;
 import app.organicmaps.widget.placepage.PlacePageData;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
-
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
@@ -188,7 +187,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   private MapFragment mMapFragment;
 
   private View mPointChooser;
-  private MaterialToolbar mPointChooserToolbar;
+  private Toolbar mPointChooserToolbar;
 
   private RoutingPlanInplaceController mRoutingPlanInplaceController;
 

android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java

@@ -15,12 +15,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 
-import com.google.android.material.appbar.MaterialToolbar;
-
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.SplashActivity;
@@ -149,7 +148,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
     onBackPressed();
   }
 
-  protected MaterialToolbar getToolbar()
+  protected Toolbar getToolbar()
   {
     return findViewById(R.id.toolbar);
   }

android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java

@@ -10,13 +10,11 @@ import androidx.annotation.CallSuper;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.appbar.MaterialToolbar;
-
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -25,7 +23,7 @@ import app.organicmaps.widget.PlaceholderView;
 
 public abstract class BaseMwmRecyclerFragment<T extends RecyclerView.Adapter> extends Fragment
 {
-  private MaterialToolbar mToolbar;
+  private Toolbar mToolbar;
 
   @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull

android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java

@@ -6,13 +6,11 @@ import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
-
-import com.google.android.material.appbar.MaterialToolbar;
-
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
@@ -28,7 +26,7 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
   {
     super.onSafeCreate(savedInstanceState);
 
-    MaterialToolbar toolbar = getToolbar();
+    Toolbar toolbar = getToolbar();
     if (toolbar != null)
     {
       int title = getToolbarTitle();
@@ -44,7 +42,7 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
     }
   }
 
-  protected void setupHomeButton(@NonNull MaterialToolbar toolbar)
+  protected void setupHomeButton(@NonNull Toolbar toolbar)
   {
     UiUtils.showHomeUpButton(toolbar);
   }
@@ -94,7 +92,7 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
 
     if (title != null)
     {
-      MaterialToolbar toolbar = getToolbar();
+      Toolbar toolbar = getToolbar();
       if (toolbar != null && toolbar.getTitle() != null)
       {
         mLastTitle = toolbar.getTitle().toString();

android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java

@@ -480,13 +480,6 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
       UiUtils.showIf(mSearchResultsMode && !TextUtils.isEmpty(found), mFoundName);
 
-      long size = getMapDisplaySize();
-      mSize.setText(StringUtils.getFileSizeString(mFragment.requireContext(), size));
-      mStatusIcon.update(mItem);
-    }
-
-    private long getMapDisplaySize()
-    {
       long size;
       if (mItem.status == CountryItem.STATUS_ENQUEUED ||
           mItem.status == CountryItem.STATUS_PROGRESS ||
@@ -494,16 +487,13 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       {
         size = mItem.enqueuedSize;
       }
-      else if (mItem.status == CountryItem.STATUS_FAILED ||
-          mItem.status == CountryItem.STATUS_DOWNLOADABLE)
-      {
-        size = mItem.totalSize;
-      }
       else
       {
         size = ((!mSearchResultsMode && mMyMapsMode) ? mItem.size : mItem.totalSize);
       }
-      return size;
+
+      mSize.setText(StringUtils.getFileSizeString(mFragment.requireContext(), size));
+      mStatusIcon.update(mItem);
     }
   }
 

android/app/src/main/java/app/organicmaps/search/SearchFragment.java

@@ -16,6 +16,7 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -46,7 +47,6 @@ import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.PlaceholderView;
 import app.organicmaps.widget.SearchToolbarController;
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
@@ -226,7 +226,7 @@ public class SearchFragment extends BaseMwmFragment
   private void updateFrames()
   {
     final boolean hasQuery = mToolbarController.hasQuery();
-    MaterialToolbar toolbar = mToolbarController.getToolbar();
+    Toolbar toolbar = mToolbarController.getToolbar();
     AppBarLayout.LayoutParams lp = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();
     lp.setScrollFlags(hasQuery ? AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
                                  | AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL : 0);

android/app/src/main/java/app/organicmaps/util/UiUtils.java

@@ -27,6 +27,7 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.Insets;
@@ -36,8 +37,6 @@ import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.textfield.TextInputLayout;
 
 import java.util.Objects;
@@ -194,7 +193,7 @@ public final class UiUtils
     hide(tv);
   }
 
-  public static void showHomeUpButton(MaterialToolbar toolbar)
+  public static void showHomeUpButton(Toolbar toolbar)
   {
     toolbar.setNavigationIcon(ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
   }
@@ -298,7 +297,7 @@ public final class UiUtils
                     systemInsets.right, view.getPaddingBottom());
   }
 
-  public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar,
+  public static void setupNavigationIcon(@NonNull Toolbar toolbar,
                                          @NonNull View.OnClickListener listener)
   {
     View customNavigationButton = toolbar.findViewById(R.id.back);
@@ -312,14 +311,14 @@ public final class UiUtils
     }
   }
 
-  public static void setupHomeUpButtonAsNavigationIcon(@NonNull MaterialToolbar toolbar,
+  public static void setupHomeUpButtonAsNavigationIcon(@NonNull Toolbar toolbar,
                                                        @NonNull View.OnClickListener listener)
   {
     UiUtils.showHomeUpButton(toolbar);
     toolbar.setNavigationOnClickListener(listener);
   }
 
-  public static void clearHomeUpButton(@NonNull MaterialToolbar toolbar)
+  public static void clearHomeUpButton(@NonNull Toolbar toolbar)
   {
     toolbar.setNavigationIcon(null);
     toolbar.setNavigationOnClickListener(null);

android/app/src/main/java/app/organicmaps/widget/ToolbarController.java

@@ -9,10 +9,8 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
-
-import com.google.android.material.appbar.MaterialToolbar;
-
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -23,7 +21,7 @@ public class ToolbarController
   @Nullable
   private  Activity mActivity;
   @NonNull
-  private final MaterialToolbar mToolbar;
+  private final Toolbar mToolbar;
   @NonNull
   protected final View.OnClickListener mNavigationClickListener = view -> onUpClick();
 
@@ -41,7 +39,7 @@ public class ToolbarController
     setSupportActionBar(activity, mToolbar);
   }
 
-  private void setSupportActionBar(@NonNull Activity activity, @NonNull MaterialToolbar toolbar)
+  private void setSupportActionBar(@NonNull Activity activity, @NonNull Toolbar toolbar)
   {
     AppCompatActivity appCompatActivity = (AppCompatActivity) activity;
     appCompatActivity.setSupportActionBar(toolbar);
@@ -88,7 +86,7 @@ public class ToolbarController
   }
 
   @NonNull
-  public MaterialToolbar getToolbar()
+  public Toolbar getToolbar()
   {
     return mToolbar;
   }

android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -32,8 +33,6 @@ import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
-
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
@@ -204,7 +203,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
 
   private void initToolbar(View view)
   {
-    MaterialToolbar toolbar = view.findViewById(R.id.toolbar);
+    Toolbar toolbar = view.findViewById(R.id.toolbar);
 
     ViewCompat.setOnApplyWindowInsetsListener(toolbar, PaddingInsetsListener.excludeBottom());
 

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java

@@ -18,6 +18,7 @@ import android.widget.TextView;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -51,8 +52,6 @@ import app.organicmaps.widget.placepage.sections.PlacePageOpeningHoursFragment;
 import app.organicmaps.widget.placepage.sections.PlacePagePhoneFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageProductsFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageWikipediaFragment;
-
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.button.MaterialButton;
 
 import java.util.ArrayList;
@@ -87,7 +86,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
   private View mFrame;
   // Preview.
   private ViewGroup mPreview;
-  private MaterialToolbar mToolbar;
+  private Toolbar mToolbar;
   private TextView mTvTitle;
   private TextView mTvSecondaryTitle;
   private TextView mTvSubtitle;

android/app/src/main/res/layout/accept_decline_button_container.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools">
+  <LinearLayout
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <Button
+      android:id="@+id/accept_btn"
+      style="@style/MwmWidget.Button.Primary"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/accept"/>
+    <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/sharing_options_img_size">
+      <TextView
+        android:id="@+id/decline_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="?attr/selectableItemBackground"
+        android:fontFamily="@string/robotoMedium"
+        android:gravity="center"
+        android:letterSpacing="0.01"
+        android:textAllCaps="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textSize="@dimen/text_size_body_3"
+        android:textStyle="normal"
+        android:text="@string/learn_more"
+        tools:ignore="UnusedAttribute"
+        tools:text="NOT NOW" />
+    </FrameLayout>
+  </LinearLayout>
+</merge>

android/app/src/main/res/layout/activity_map_placeholder.xml

@@ -8,7 +8,7 @@
   android:gravity="center"
   android:orientation="vertical">
 
-  <com.google.android.material.imageview.ShapeableImageView
+  <androidx.appcompat.widget.AppCompatImageView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_margin="32dp"
@@ -22,7 +22,7 @@
       android:gravity="center"
       android:orientation="vertical">
 
-    <com.google.android.material.textview.MaterialTextView
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
@@ -31,7 +31,7 @@
         android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
         android:textStyle="bold" />
 
-    <com.google.android.material.textview.MaterialTextView
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/car_used_on_the_car_screen"
@@ -39,7 +39,7 @@
         android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
   </LinearLayout>
 
-  <com.google.android.material.button.MaterialButton
+  <Button
       android:id="@+id/btn_continue"
       style="@style/MwmWidget.Button.Accent"
       android:layout_width="match_parent"

android/app/src/main/res/layout/activity_request_permissions.xml

@@ -7,13 +7,13 @@
     android:gravity="center"
     android:orientation="vertical">
 
-  <com.google.android.material.imageview.ShapeableImageView
+  <ImageView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_margin="32dp"
       app:srcCompat="@drawable/ic_location_permission_request" />
 
-  <com.google.android.material.textview.MaterialTextView
+  <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="32dp"
@@ -23,7 +23,7 @@
       android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
       android:textStyle="bold" />
 
-  <com.google.android.material.button.MaterialButton
+  <Button
       android:id="@+id/btn_grant_permissions"
       style="@style/MwmWidget.Button.Accent"
       android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_bookmark_category_settings.xml

@@ -6,7 +6,7 @@
   android:background="?cardBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_driving_options.xml

@@ -6,7 +6,7 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
@@ -15,7 +15,7 @@
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme"
     tools:ignore="UnusedAttribute">
-  </com.google.android.material.appbar.MaterialToolbar>
+  </androidx.appcompat.widget.Toolbar>
   <LinearLayout
     android:layout_marginTop="@dimen/margin_half_double_plus"
     android:orientation="horizontal"

android/app/src/main/res/layout/fragment_edit_bookmark.xml

@@ -5,7 +5,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="?windowBackgroundForced">
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
@@ -22,7 +22,7 @@
         android:layout_gravity="end|center_vertical"
         android:scaleType="centerInside"
         android:contentDescription="@string/save" />
-  </com.google.android.material.appbar.MaterialToolbar>
+  </androidx.appcompat.widget.Toolbar>
   <FrameLayout
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_editor_host.xml

@@ -7,7 +7,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:orientation="vertical">
 
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
@@ -43,7 +43,7 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-  </com.google.android.material.appbar.MaterialToolbar>
+  </androidx.appcompat.widget.Toolbar>
 
   <FrameLayout
     android:id="@+id/fragment_container"

android/app/src/main/res/layout/fragment_report.xml

@@ -6,7 +6,7 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
@@ -18,7 +18,7 @@
       android:id="@+id/save"
       style="@style/MwmWidget.Downloader.ToolbarButton"
       android:text="@string/editor_report_problem_send_button"/>
-  </com.google.android.material.appbar.MaterialToolbar>
+  </androidx.appcompat.widget.Toolbar>
 
   <ScrollView
     android:id="@+id/scrollView"

android/app/src/main/res/layout/position_chooser.xml

@@ -6,7 +6,7 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
     android:id="@+id/toolbar_point_chooser"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
@@ -41,7 +41,7 @@
 
     </LinearLayout>
 
-  </com.google.android.material.appbar.MaterialToolbar>
+  </androidx.appcompat.widget.Toolbar>
 
   <TextView
     android:layout_width="match_parent"

android/app/src/main/res/layout/routing_plan.xml

@@ -11,7 +11,7 @@
   <FrameLayout android:layout_width="match_parent"
                android:layout_height="wrap_content">
 
-    <com.google.android.material.appbar.MaterialToolbar
+    <androidx.appcompat.widget.Toolbar
       android:id="@+id/toolbar"
       style="@style/MwmWidget.ToolbarStyle"
       android:theme="@style/MwmWidget.ToolbarTheme"
@@ -131,7 +131,7 @@
 
       </RelativeLayout>
 
-    </com.google.android.material.appbar.MaterialToolbar>
+    </androidx.appcompat.widget.Toolbar>
   </FrameLayout>
   <FrameLayout
     android:id="@+id/driving_options_btn_container"

android/app/src/main/res/layout/toolbar_default.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"

android/app/src/main/res/layout/toolbar_extended.xml

@@ -4,7 +4,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:orientation="vertical">
-  <com.google.android.material.appbar.MaterialToolbar
+  <androidx.appcompat.widget.Toolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"

android/app/src/main/res/layout/toolbar_transparent.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
+<androidx.appcompat.widget.Toolbar
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/toolbar"
   style="@style/MwmWidget.ToolbarStyle"

android/app/src/main/res/layout/toolbar_with_optional_search.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
+<androidx.appcompat.widget.Toolbar
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/toolbar"
   style="@style/MwmWidget.ToolbarStyle.NoElevation"
@@ -11,4 +11,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:visibility="gone"/>
-</com.google.android.material.appbar.MaterialToolbar>
+</androidx.appcompat.widget.Toolbar>

android/app/src/main/res/layout/toolbar_with_search.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
+<androidx.appcompat.widget.Toolbar
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/toolbar"
   style="@style/MwmWidget.ToolbarStyle"
@@ -13,4 +13,4 @@
     android:orientation="vertical">
     <include layout="@layout/toolbar_search_controls" />
   </LinearLayout>
-</com.google.android.material.appbar.MaterialToolbar>
+</androidx.appcompat.widget.Toolbar>

android/app/src/main/res/layout/toolbar_with_search_no_elevation.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
+<androidx.appcompat.widget.Toolbar
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/toolbar"
   style="@style/MwmWidget.ToolbarStyle.NoElevation"
@@ -12,4 +12,4 @@
     android:orientation="vertical">
     <include layout="@layout/toolbar_search_controls" />
   </LinearLayout>
-</com.google.android.material.appbar.MaterialToolbar>
+</androidx.appcompat.widget.Toolbar>

android/app/src/main/res/values-ar/types_strings.xml

@@ -45,7 +45,7 @@
     <string name="type.amenity.charging_station">محطة شحن</string>
     <string name="type.amenity.charging_station.bicycle">محطة شحن الدراجات</string>
     <string name="type.amenity.charging_station.motorcar">محطة شحن السيارات</string>
-    <string name="type.amenity.childcare">حضّانة</string>
+    <string name="type.amenity.childcare">حضانة</string>
     <string name="type.amenity.cinema">سينما</string>
     <string name="type.leisure.bowling_alley">صالة بولينج</string>
     <string name="type.amenity.clinic">عيادة</string>
@@ -62,7 +62,7 @@
     <string name="type.amenity.exhibition_centre">مركز المعرض</string>
     <string name="type.amenity.money_transfer">تحويل المال</string>
     <string name="type.amenity.music_school">مدرسة موسيقى</string>
-    <string name="type.amenity.language_school">مدرسة لغات</string>
+    <string name="type.amenity.language_school">مدرسة لغة</string>
     <string name="type.office.diplomatic">سفارة</string>
     <string name="type.amenity.fast_food">وجبات سريعة</string>
     <string name="type.amenity.ferry_terminal">محطة عبّارات</string>
@@ -1278,7 +1278,4 @@
     <string name="type.amenity.dojo">دوجو</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">الصالة الرياضية</string>
-    <string name="type.aerialway.mixed_lift">رفع مختلط</string>
-    <string name="type.amenity.love_hotel">فندق جب</string>
-    <string name="type.amenity.studio">معرض</string>
 </resources>

android/app/src/main/res/values-ja/types_strings.xml

@@ -1332,8 +1332,4 @@
     <string name="type.organic.only">有機</string>
     <string name="type.organic.yes">有機</string>
     <string name="type.power.pole">電柱</string>
-    <string name="type.amenity.shelter.lean_to">三壁の避難所</string>
-    <string name="type.amenity.vending_machine.excrement_bags">うんち袋の自販機</string>
-    <string name="type.amenity.parcel_locker">宅配ロッカー</string>
-    <string name="type.amenity.waste_transfer_station">ゴミ処理場</string>
 </resources>

android/app/src/main/res/values-zh-rHK/types_strings.xml

@@ -179,7 +179,7 @@
     <string name="type.amenity.veterinary">獸醫</string>
     <string name="type.amenity.waste_basket">垃圾箱</string>
     <string name="type.amenity.waste_disposal">垃圾</string>
-    <string name="type.amenity.waste_transfer_station">廢物轉運站</string>
+    <string name="type.amenity.waste_transfer_station">垃圾轉運站</string>
     <string name="type.amenity.water_point">飲水站</string>
     <string name="type.amenity.water_point.drinking_water_no">飲水站</string>
     <string name="type.barrier">障礙物</string>
@@ -1281,5 +1281,4 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">體育館</string>
     <string name="type.attraction.bumper_car">碰碰車</string>
-    <string name="type.leisure.track">賽道</string>
 </resources>

android/app/src/main/res/values-zh-rTW/types_strings.xml

@@ -32,7 +32,4 @@
     <string name="type.organic.yes">有機</string>
     <string name="type.power.pole">電線桿</string>
     <string name="type.amenity.shelter.lean_to">三面避難所</string>
-    <string name="type.amenity.waste_transfer_station">垃圾轉運站</string>
-    <string name="type.amenity.vending_machine.excrement_bags">撿便袋販賣機</string>
-    <string name="type.amenity.parcel_locker">智取櫃</string>
 </resources>

data/colors.txt

@@ -59,7 +59,6 @@
 2236962
 2301728
 2302755
-2364429
 2367520
 2374579
 2399474
@@ -67,7 +66,6 @@
 2498323
 2499106
 2500128
-2592674
 2631706
 2695475
 2706568
@@ -89,6 +87,7 @@
 3434779
 3542630
 3552308
+3584191
 3629602
 3677972
 3681605
@@ -96,7 +95,6 @@
 3684408
 3773998
 3832097
-3874837
 3881273
 3881787
 3968060
@@ -146,7 +144,6 @@
 6164237
 6173981
 6247213
-6272197
 6291544
 6381914
 6381921
@@ -163,7 +160,6 @@
 6967599
 7105644
 7224647
-7302655
 7353344
 7434609
 7542806
@@ -193,15 +189,12 @@
 8550167
 8916559
 8947848
-9099495
 9163744
 9211020
-9326109
 9404166
 9682745
 9718290
-9815480
-9868939
+9868678
 9868950
 10066329
 10167040
@@ -212,164 +205,142 @@
 10340289
 10395294
 10426903
+10506258
 10592406
 10790054
 11053224
 11057133
-11058780
 11112295
 11184810
+11190117
 11250586
-11387999
-11579812
-11585379
+11453035
+11584112
+11710882
 11711154
-11716458
 11720246
 11720952
 11770767
+11781233
 11836942
 11841150
 11898395
-11979115
 12000284
 12039862
 12105912
-12504182
+12372094
 12517551
-12699589
-12837073
+12700809
+12763315
 12895428
-12896712
-12898689
-13028554
+13029267
 13031851
-13161612
+13155550
 13163437
+13224123
 13229526
-13357519
 13407549
 13420474
+13484259
 13538264
-13554898
-13555607
-13685196
+13615592
+13620648
+13746411
+13749671
+13942770
 13947850
-13952918
-14014162
+14144428
 14209512
 14275263
+14539184
 14802147
 14934482
 14951168
-14999725
+14999213
+15000299
 15014691
 15022389
 15037299
+15062700
 15066325
 15086900
 15094016
-15128239
 15214341
 15260347
 15263452
-15263457
-15263939
+15591638
 15592411
 15592899
 15656370
 15658734
 15690752
 15754290
-15763456
 15790320
-15898392
-15900208
-15902016
+15920858
+15921852
 15921870
 16027569
 16056407
 16064048
-16087552
 16088855
-16103246
-16115926
-16117459
 16118756
 16119285
-16169823
-16173957
-16180686
-16182236
-16183529
-16248287
-16311234
-16372627
+16308697
+16311482
+16316664
 16391736
-16431936
-16433750
 16557154
+16575614
 16579778
 16579836
 16728450
 16733986
 16740096
+16741158
+16742950
+16746278
 16746306
 16747109
 16748864
+16749632
 16750080
 16750592
+16752972
 16756055
+16757286
 16760320
+16760658
 16762880
 16763432
 16763913
-16764506
 16765952
-16766323
-16767702
-16770999
 16774560
-16775925
-16776958
 16777215
-223300167
-234881023
 436602368
 437326080
-438572045
 439885588
-441002267
 441140803
 441199131
-441272132
-441403975
+441925171
 442905727
-443115881
-443432263
-443510271
-446405263
 451800027
-452107824
-452109632
-452377439
+452524280
 452764770
-452983541
-452984574
+452968274
 452984831
-575358531
-587201269
 609045837
 654706176
 655629312
-658186261
+659106075
 659244611
+659375940
+659507783
 660157219
-666290539
-670074880
-670398976
-670414670
-671088382
+666683518
+670628088
+671054374
+671057702
+671061056
 671088639
 856032768
 856756480
@@ -378,7 +349,6 @@
 857223704
 857282841
 857551774
-858002445
 858401316
 858466343
 858532890
@@ -387,13 +357,12 @@
 859519803
 859645463
 860111940
-860432667
 860571203
 860629531
-860834375
 861027891
 861097451
-861483811
+861295871
+861355571
 861690961
 861690972
 861885229
@@ -401,33 +370,28 @@
 862148400
 862348902
 862862663
-862940671
 863203947
 863664762
 863850275
 864585864
 864835622
-864964125
+864925824
 865356306
-865445970
 865871792
+866144274
 868514559
+868862139
+869387687
 869585866
-869590934
-869652178
 870704341
 871230427
-871536408
-871540032
-871741262
-871807839
-871811973
+871954680
 872195170
-872215006
-872413941
-872414974
+872395302
 872415231
 1074136576
+1078675011
+1090058488
 1090519039
 1216522952
 1291845632
@@ -442,7 +406,6 @@
 1293490457
 1293753629
 1294082594
-1294210061
 1294608932
 1294673959
 1294738992
@@ -451,13 +414,14 @@
 1295200561
 1295201075
 1295397940
+1295429823
 1295523604
 1295527997
 1295658816
-1295720469
 1295727419
 1295853079
 1295855912
+1296187970
 1296316234
 1296319556
 1296381741
@@ -468,6 +432,7 @@
 1296845900
 1296910148
 1296977469
+1297041991
 1297109072
 1297235507
 1297305067
@@ -478,9 +443,7 @@
 1297898588
 1298019613
 1298092845
-1298117829
 1298131758
-1298227553
 1298283903
 1298356016
 1298359132
@@ -494,46 +457,38 @@
 1300793480
 1301043238
 1301056384
-1301171741
+1301133440
 1301433013
 1301563922
-1301653586
-1301661112
 1301714310
-1301714571
 1302101349
-1302438038
-1303425444
+1302185921
+1302351890
 1303556514
 1304148906
-1304535147
+1304608947
 1304722175
 1304938175
+1305069755
+1305595303
 1305793482
-1305798550
-1305859794
-1306645694
 1306647779
 1306780114
 1307438043
 1307504366
-1307744024
-1307747648
-1307933184
-1307948878
-1307961558
 1307964388
-1308015455
-1308019589
-1308218259
-1308422622
+1308162296
+1308402786
 1308425468
 1308576652
+1308586790
+1308588582
 1308591910
 1308594496
+1308595264
 1308601687
 1308604747
-1308622590
+1308606290
 1308622847
 1511594265
 1523897290
@@ -553,33 +508,29 @@
 1715283479
 1715287582
 1715749956
-1716070683
+1715771835
 1716276300
 1716665907
 1716868437
 1716933887
-1717150383
 1717328977
 1717523245
 1717714303
 1717786416
 1717789532
 1718500679
-1718578687
 1719302778
 1719488291
 1720223880
 1720473638
 1720486784
-1720602141
 1720994322
 1721144710
 1721782290
 1724152575
 1724368575
-1724437644
-1725290194
-1727174424
+1724500155
+1724896680
 1728053247
 1931024665
 1943327690
@@ -594,7 +545,9 @@
 2149720610
 2150377008
 2150839091
+2151067839
 2151296832
+2151365435
 2151493928
 2151825986
 2151957572
@@ -603,13 +556,12 @@
 2152483916
 2152615485
 2153076053
+2153141503
 2153536593
-2153755845
 2153769774
 2153921919
 2153997148
 2154708295
-2154786303
 2154984050
 2155510394
 2155695907
@@ -618,19 +570,20 @@
 2156431496
 2156681254
 2156694400
-2157291602
+2156771456
 2157352326
 2157739365
 2159194530
 2159483932
+2160246963
 2160360191
-2161168844
+2160707771
 2162418130
 2162506037
 2163123456
+2163800312
 2164002331
 2164214668
-2164260606
 2164260863
 2370396489
 2371253590
@@ -648,20 +601,22 @@
 2571387972
 2571723081
 2571847235
+2572571903
 2572580182
 2573200174
 2573352319
+2574138695
 2575126307
 2575861896
 2576111654
-2576722002
+2576201856
 2576782726
 2579790591
 2580006591
-2580075660
+2580534696
 2582553856
+2583230712
 2583432731
-2583691006
 2583691263
 2787649562
 2789826889
@@ -678,13 +633,17 @@
 3006477107
 3006694172
 3007595588
+3007916315
 3008113177
+3008779519
 3009559935
+3010346311
 3012069512
 3015998207
 3016153515
 3018761472
 3019640347
+3019862822
 3019870528
 3019898879
 3226034505
@@ -696,7 +655,6 @@
 3427361097
 3428218198
 3428990335
-3430649653
 3431500856
 3432785840
 3435428607
@@ -709,7 +667,7 @@
 3645464905
 3646322006
 3647094143
-3649755367
+3649819616
 3653532415
 3657174555
 3942645760

data/patterns.txt

@@ -24,35 +24,29 @@
 10.8 4.5
 13.5 5.4
 18.0 6.2
-5.0 1.5
-6.0 1.8
-8.0 2.3
-10.0 2.7
-6.0 9.0
-8.0 10.0
-10.0 11.0
-15.0 15.0
-20.0 20.0
-4.0 1.0
-6.0 1.3
-8.0 1.5
-9.0 1.8
-11.0 2.3
-13.0 2.7
+5.0 2.0
+6.0 2.5
+8.0 3.0
+10.0 3.5
+5.0 3.0
+6.0 4.2
+8.0 5.5
+10.0 6.7
+2.0 1.0
+3.6 1.6
+5.0 2.2
+5.4 2.7
+7.0 3.0
+16.2 8.1
 5.0 5.0
 4.0 4.0
 3.5 2.0
 4.0 2.5
 6.0 3.5
 8.0 4.5
-7.0 9.6
 3.5 2.7
-7.5 9.5
 4.0 3.2
-8.0 9.4
-8.5 9.3
 6.0 4.7
-9.0 9.2
 8.0 6.2
 1.0 2.0
 1.8 2.5
@@ -65,8 +59,6 @@
 2.5 2.2
 3.2 2.8
 4.0 3.5
-6.0 2.5
-7.0 3.0
 9.0 3.5
 12.0 3.5
 4.0 2.0 2.0 1.5
@@ -86,16 +78,12 @@
 10.0 10.0
 13.0 13.0
 16.0 16.0
-5.4 2.7
 2.7 2.7
 4.95 4.95
 6.0 1.0
 7.0 1.2
 9.0 1.7
 12.0 2.2
-2.0 6.0
-3.0 7.0
-4.0 8.0
 3.5 2.5
 4.0 3.0
 6.0 4.5
@@ -114,7 +102,6 @@
 2.5 7.0
 5.2 5.2
 3.5 3.5
-5.0 2.0
 10.1 10.1
 0.8 12.0
 1.15 14.0

data/styles/default/dark/colors.mapcss

@@ -50,7 +50,6 @@
 /*3.2 Vegetation*/
 
 @forest: #141C00;
-@heath: #0F1400;
 @green0: #0F1400;
 @green1: #131900;
 @green1b: #141C00;
@@ -102,8 +101,6 @@
 /* 5.ROADS */
 /* 5.1 All roads */
 
-@motorway0: #3B2015;
-@motorway1: #3B2015;
 @trunk0: #49291B;
 @trunk1: #49291B;
 @primary0: #593323;
@@ -129,8 +126,6 @@
 
 /* 5.3 Tunnels */
 
-@motorway_tunnel: #24140D;
-@motorway_tunnel_casing: #000000;
 @trunk_tunnel: #381F14;
 @trunk_tunnel_casing: #000000;
 @primary_tunnel: #4C2A1B;

data/styles/default/include/Basemap.mapcss

@@ -91,11 +91,11 @@ line|z10-[boundary=administrative][admin_level=4]
 
 area|z10-[landuse=forest],
 area|z10-[leisure=park],
-area|z12-[natural=heath],
 area|z12-[leisure=garden],
 area|z12-[landuse=grass],
 area|z12-[natural=grassland],
 area|z12-[leisure=golf_course],
+area|z12-[natural=heath],
 area|z12-[landuse=allotments],
 area|z12-[natural=bare_rock],
 area|z12-[natural=shingle],
@@ -131,6 +131,7 @@ area|z16-[landuse=grass],
 area|z14-15[natural=grassland],
 area|z14-[leisure=golf_course],
 area|z14-[leisure=miniature_golf],
+area|z14-[natural=heath],
 area|z14-[landuse=allotments],
 area|z14-[landuse=orchard],
 area|z14-[landuse=plant_nursery],
@@ -140,11 +141,10 @@ area|z14-[landuse=recreation_ground],
 area|z14-[landuse=village_green],
 area|z14-[landuse=field],
 {fill-color: @green1;}
-area|z11[landuse=forest],
 area|z16-[natural=grassland],
 area|z16-[landuse=meadow],
 {fill-color: @green1b;}
-area|z12[landuse=forest],
+area|z11-12[landuse=forest],
 area|z12[leisure=garden],
 {fill-color: @green2;}
 area|z13[landuse=forest],
@@ -167,11 +167,10 @@ area|z16-[leisure=garden][garden:type=residential],
 area|z17-[leisure=garden][garden:type=residential],
 {fill-color: @green2;}
 
-area|z12-[natural=heath],
-{fill-color: @heath;}
 area|z12-13[landuse=grass],
 area|z12-13[natural=grassland],
 area|z12-13[leisure=golf_course],
+area|z12-13[natural=heath],
 area|z12-13[landuse=allotments],
 area|z12-13[landuse=orchard],
 area|z12-13[landuse=plant_nursery],
@@ -549,11 +548,11 @@ line|z19-[man_made=cutline],
 
 area|z14[building],
 area|z14[waterway=dam],
-{fill-color: @building0;fill-opacity: 0.6;}
+{fill-color: @building0;fill-opacity: 0.5;}
 
 area|z15[building],
 area|z15[waterway=dam],
-{fill-color: @building0;fill-opacity: 0.7;}
+{fill-color: @building0;fill-opacity: 0.6;}
 
 area|z14-15[aeroway=terminal],
 area|z16[building],
@@ -606,13 +605,13 @@ line|z19-[barrier=hedge],
 
 line|z14-[barrier=city_wall],
 line|z14-[historic=citywalls],
-{color: @building_border1; width: 2; opacity: 0.9;}
+{color: @building1; width: 2; opacity: 0.7;}
 line|z15[barrier=city_wall],
 line|z15[historic=citywalls],
 {width: 2.8;}
 line|z16-[barrier=city_wall],
 line|z16-[historic=citywalls],
-{width: 4.5; dashes: 3,3,1.5,3;}
+{color: @building0; width: 4.5; dashes: 3,3,1.5,3;}
 line|z17[barrier=city_wall],
 line|z17[historic=citywalls],
 {width: 5.9; dashes: 4,4,1.9,4;}
@@ -657,7 +656,7 @@ line|z18-[barrier=retaining_wall],
 
 
 line|z16-[man_made=embankment],
-{color: @building_border0; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.7;}
+{color: @building1; width: 3.5; dashes: 4,2,2,1.5; opacity: 0.7;}
 line|z17[man_made=embankment],
 {width: 5; dashes: 6,3,3,2;}
 line|z18-[man_made=embankment],

data/styles/default/include/Roads.mapcss

@@ -53,7 +53,7 @@
 
 line|z6-9[highway=world_towns_level],
 line|z4-9[highway=world_level],
-{color: @motorway1;opacity: 1;}
+{color: @trunk1;opacity: 1;}
 
 line|z4[highway=world_level]
 {width: 0.5;}
@@ -73,23 +73,20 @@ line|z9[highway=world_level]
 
 /* 3.TRUNK & MOTORWAY 6-22 ZOOM */
 
-line|z6[highway=motorway],
-{color: @motorway0; opacity: 1;}
 line|z6[highway=trunk],
-{color: @trunk0; opacity: 0.6;}
-line|z7-13[highway=motorway],
-{color: @motorway0; opacity: 1;}
+line|z6[highway=motorway],
+{color: @trunk0; opacity: 0.3;}
 line|z7-9[highway=trunk],
-{color: @trunk0; opacity: 0.8;}
-line|z10-13[highway=trunk],
-{color: @trunk1; opacity: 1;}
-line|z14-[highway=motorway],
-{color: @motorway1;}
-line|z14-[highway=trunk],
-{color: @trunk1; opacity: 0.9;}
+line|z7-9[highway=motorway],
+{color: @trunk0; opacity: 0.7;}
+
+line|z10-[highway=trunk],
+line|z10-[highway=motorway],
+{color: @trunk1; opacity: 0.7;}
 line|z10-[highway=motorway_link],
 line|z10-[highway=trunk_link],
 {color: @primary0; opacity: 0.7;}
+line|z13-14[highway=trunk],
 line|z13-14[highway=motorway],
 line|z14-15[highway=motorway_link],
 line|z14-15[highway=trunk_link],
@@ -113,112 +110,85 @@ line|z14-[highway=trunk_link][bridge?]::bridgeblack,
 
 /* 3.1 Trunk & Motorway 6-22 ZOOM */
 
-line|z6[highway=motorway],
-{width: 1.7;}
-line|z7[highway=motorway]
-{width: 1.8;}
-line|z8[highway=motorway]
-{width: 1.9;}
-line|z9[highway=motorway]
-{width: 2.0;}
-line|z10[highway=motorway]
-{width: 2.2;}
-line|z11[highway=motorway]
-{width: 2.4;}
-line|z12[highway=motorway]
-{width: 2.7;}
-line|z13[highway=motorway],
-{width: 3.6;}
-line|z14[highway=motorway],
-{width: 4.4;}
-line|z15[highway=motorway],
-{width: 5.6;}
-line|z16[highway=motorway],
-{width: 7.8;}
-line|z17[highway=motorway],
-{width: 9.0;}
-line|z18[highway=motorway],
-{width: 12.0;}
-line|z19-[highway=motorway],
-{width: 16.0;}
-
 line|z6[highway=trunk],
+line|z6[highway=motorway],
 {width: 0.8;}
 line|z7[highway=trunk],
+line|z7[highway=motorway]
 {width: 0.9;}
 line|z8[highway=trunk],
-{width: 1.2;}
+line|z8[highway=motorway]
+{width: 1.1;}
 line|z9[highway=trunk],
-{width: 1.3;}
+line|z9[highway=motorway]
+{width: 1.2;}
 line|z10[highway=trunk],
-{width: 1.9;}
+line|z10[highway=motorway]
+{width: 1.5;}
 line|z11[highway=trunk],
-{width: 2.1;}
+line|z11[highway=motorway]
+{width: 1.7;}
 line|z12[highway=trunk],
-{width: 2.4;}
+line|z12[highway=motorway]
+{width: 1.9;}
 line|z13[highway=trunk],
-{width: 3.2;}
+line|z13[highway=motorway],
+{width: 2.8;}
 line|z14[highway=trunk],
-{width: 4.0;}
+line|z14[highway=motorway],
+{width: 3.8;}
 line|z15[highway=trunk],
-{width: 4.8;}
+line|z15[highway=motorway],
+{width: 4.4;}
 line|z16[highway=trunk],
-{width: 6.2;}
+line|z16[highway=motorway],
+{width: 6;}
 line|z17[highway=trunk],
+line|z17[highway=motorway],
 {width: 8.2;}
 line|z18[highway=trunk],
+line|z18[highway=motorway],
 {width: 11;}
 line|z19-[highway=trunk],
+line|z19-[highway=motorway],
 {width: 13.5;}
 
 line|z10[highway=motorway_link],
-{width: 0.9;}
-line|z11[highway=motorway_link],
-{width: 1.1;}
-line|z12[highway=motorway_link],
-{width: 1.4;}
-line|z13[highway=motorway_link],
-{width: 1.9;}
-line|z14[highway=motorway_link],
-{width: 2.7;}
-line|z15[highway=motorway_link],
-{width: 3.7;}
-line|z16[highway=motorway_link],
-{width: 5.1;}
-line|z17[highway=motorway_link],
-{width: 6.7;}
-line|z18[highway=motorway_link],
-{width: 9.5;}
-line|z19-[highway=motorway_link],
-{width: 11.7;}
-
 line|z10[highway=trunk_link]
 {width: 0.8;}
+line|z11[highway=motorway_link],
 line|z11[highway=trunk_link]
 {width: 1.0;}
+line|z12[highway=motorway_link],
 line|z12[highway=trunk_link]
 {width: 1.3;}
+line|z13[highway=motorway_link],
 line|z13[highway=trunk_link]
 {width: 1.8;}
+line|z14[highway=motorway_link],
 line|z14[highway=trunk_link]
 {width: 2.6;}
+line|z15[highway=motorway_link],
 line|z15[highway=trunk_link]
 {width: 3.6;}
+line|z16[highway=motorway_link],
 line|z16[highway=trunk_link]
 {width: 5;}
+line|z17[highway=motorway_link],
 line|z17[highway=trunk_link]
 {width: 6.6;}
+line|z18[highway=motorway_link],
 line|z18[highway=trunk_link]
 {width: 9.4;}
+line|z19-[highway=motorway_link],
 line|z19-[highway=trunk_link]
 {width: 11.6;}
 
 /* 3.2 Trunk & Motorway tunnel 12-22 ZOOM */
 
 line|z12-[highway=motorway][tunnel?],
-line|z13-[highway=motorway_link][tunnel?],
-{color: @motorway_tunnel; casing-linecap: butt; casing-color: @motorway_tunnel_casing; casing-opacity: 0.7;}
 line|z12-[highway=trunk][tunnel?],
+line|z13-[highway=motorway_link][tunnel?],
 line|z13-[highway=trunk_link][tunnel?],
 {color: @trunk_tunnel; casing-linecap: butt; casing-color: @trunk_tunnel_casing; casing-opacity: 0.7;}
 
@@ -276,12 +246,16 @@ line|z18-[highway=trunk_link][bridge?]::bridgeblack
 /* 4.PRIMARY 8-22 ZOOM */
 
 line|z8-10[highway=primary],
-{color: @primary0; opacity: 0.8;}
-line|z11-13[highway=primary],
-line|z11-13[highway=primary_link]
-{color: @primary1; opacity: 1;}
-line|z14-[highway=primary],
-line|z14-[highway=primary_link],
+{color: @primary0; opacity: 0.7;}
+
+line|z11-12[highway=primary],
+line|z11-12[highway=primary_link]
+{color: @primary1; opacity: 0.7;}
+line|z13-14[highway=primary],
+line|z13-14[highway=primary_link],
+{color: @primary1; opacity: 0.85;}
+line|z15-[highway=primary],
+line|z15-[highway=primary_link],
 {color: @primary2; opacity: 1;}
 
 line|z14-[highway=primary][bridge?]::bridgewhite,
@@ -298,26 +272,25 @@ line|z8[highway=primary],
 line|z9[highway=primary],
 {width: 0.8;}
 line|z10[highway=primary],
-{width: 1.6;}
+{width: 1.2;}
 line|z11[highway=primary],
-{width: 2.0;}
+{width: 1.5;}
 line|z12[highway=primary],
-{width: 2.2;}
+{width: 1.7;}
 line|z13[highway=primary],
-{width: 2.6;}
+{width: 2.3;}
 line|z14[highway=primary],
-{width: 3.8;}
+{width: 3.2;}
 line|z15[highway=primary],
-{width: 4.4;}
+{width: 3.8;}
 line|z16[highway=primary],
-{width: 5.4;}
+{width: 5;}
 line|z17[highway=primary],
-{width: 7;}
+{width: 6.6;}
 line|z18[highway=primary],
-{width: 10;}
+{width: 9.4;}
 line|z19-[highway=primary],
-{width: 12;}
-
+{width: 11.6;}
 
 line|z11[highway=primary_link],
 {width: 0.8;}
@@ -375,10 +348,13 @@ line|z18-[highway=primary_link][bridge?]::bridgeblack,
 
 /* 5.SECONDARY 10-22 ZOOM */
 
-line|z10-13[highway=secondary],
-{color: @secondary0; opacity: 1;}
-line|z14-[highway=secondary],
-line|z14-[highway=secondary_link],
+line|z10-12[highway=secondary],
+{color: @secondary0; opacity: 0.8;}
+line|z13-14[highway=secondary],
+line|z13-14[highway=secondary_link],
+{color: @secondary1; opacity: 0.9;}
+line|z15-[highway=secondary],
+line|z15-[highway=secondary_link],
 {color: @secondary1; opacity: 1;}
 
 line|z14-[highway=secondary][bridge?]::bridgewhite,
@@ -391,13 +367,13 @@ line|z14-[highway=secondary_link][bridge?]::bridgeblack,
 /* 5.1 Secondary 10-22 ZOOM */
 
 line|z10[highway=secondary],
-{width: 1.4;}
+{width: 1.2;}
 line|z11[highway=secondary],
-{width: 1.8;}
+{width: 1.5;}
 line|z12[highway=secondary],
-{width: 2.0;}
+{width: 1.7;}
 line|z13[highway=secondary],
-{width: 2.4;}
+{width: 2.3;}
 line|z14[highway=secondary],
 {width: 3.2;}
 line|z15[highway=secondary],
@@ -456,28 +432,18 @@ line|z18-[highway=secondary_link][bridge?]::bridgeblack
 
 /* 6.TERTIARY & UNCLASSIFIED 11-22 ZOOM */
 
-line|z11-[highway=tertiary]
-{color: @tertiary; opacity: 1;}
-line|z12-13[highway=tertiary],
-{opacity: 0.95;}
+line|z11-[highway=tertiary],
+line|z11-[highway=unclassified],
 line|z14-[highway=tertiary_link],
-{color: @tertiary;}
-line|z11-[highway=unclassified]
-{color: @tertiary; opacity: 0.95;}
-line|z12[highway=unclassified]
-{opacity: 0.8;}
-line|z13[highway=unclassified]
-{opacity: 0.58;}
+{color: @tertiary; opacity: 0.7;}
 line|z14-15[highway=tertiary],
+line|z14-15[highway=unclassified],
 line|z15-16[highway=tertiary_link],
-{color: @tertiary; opacity: 0.9;}
-line|z13-15[highway=unclassified]
-{opacity: 0.8;}
+{opacity: 0.85;}
 line|z16-[highway=tertiary],
+line|z16-[highway=unclassified],
 line|z17-[highway=tertiary_link],
 {opacity: 1;}
-line|z16-[highway=unclassified],
-{opacity: 0.9;}
 
 line|z14-[highway=tertiary][bridge?]::bridgewhite,
 line|z14-[highway=tertiary_link][bridge?]::bridgewhite
@@ -491,22 +457,31 @@ line|z14-[highway=unclassified][bridge?]::bridgeblack,
 /* 6.1 Tertiary & Unclassified 11-22 ZOOM */
 
 line|z11[highway=tertiary],
-{width: 1.2;}
+line|z11[highway=unclassified],
+{width: 0.8;}
 line|z12[highway=tertiary],
-{width: 1.6;}
+line|z12[highway=unclassified],
+{width: 1.3;}
 line|z13[highway=tertiary],
+line|z13[highway=unclassified],
 {width: 1.8;}
 line|z14[highway=tertiary],
+line|z14[highway=unclassified],
 {width: 2.7;}
 line|z15[highway=tertiary],
+line|z15[highway=unclassified],
 {width: 3.8;}
 line|z16[highway=tertiary],
+line|z16[highway=unclassified],
 {width: 5;}
 line|z17[highway=tertiary],
+line|z17[highway=unclassified],
 {width: 6.6;}
 line|z18[highway=tertiary],
+line|z18[highway=unclassified],
 {width: 9.4;}
 line|z19-[highway=tertiary],
+line|z19-[highway=unclassified],
 {width: 11.6;}
 
 line|z14[highway=tertiary_link],
@@ -522,25 +497,6 @@ line|z18[highway=tertiary_link],
 line|z19-[highway=tertiary_link],
 {width: 8.2;}
 
-line|z11[highway=unclassified],
-{width: 0.6;}
-line|z12[highway=unclassified],
-{width: 1.0;}
-line|z13[highway=unclassified],
-{width: 1.4;}
-line|z14[highway=unclassified],
-{width: 2.3;}
-line|z15[highway=unclassified],
-{width: 3.2;}
-line|z16[highway=unclassified],
-{width: 4.2;}
-line|z17[highway=unclassified],
-{width: 6;}
-line|z18[highway=unclassified],
-{width: 8;}
-line|z19-[highway=unclassified],
-{width: 10;}
-
 /* 6.2 Tertiary & Unclassified tunnel 16-22 ZOOM */
 
 line|z16-[highway=tertiary][tunnel?],
@@ -581,10 +537,10 @@ line|z18-[highway=unclassified][bridge?]::bridgeblack,
 line|z12-[highway=residential],
 line|z12-[highway=road],
 line|z12-[highway=living_street],
-{color: @residential; opacity: 0.8;}
-line|z13-16[highway=residential],
-line|z13-16[highway=road],
-line|z13-16[highway=living_street],
+{color: @residential; opacity: 0.7;}
+line|z14-16[highway=residential],
+line|z14-16[highway=road],
+line|z14-16[highway=living_street],
 {opacity: 0.85;}
 line|z17-[highway=residential],
 line|z17-[highway=road],
@@ -658,7 +614,7 @@ line|z18-[highway=residential][bridge?]::bridgeblack,
 line|z15-[highway=service],
 line|z15-[highway=service][service=busway],
 line|z15-[highway=busway],
-{color: @residential; opacity: 0.9;}
+{color: @residential; opacity: 0.8;}
 
 line|z15[highway=service],
 line|z15[highway=service][service=busway],
@@ -687,25 +643,11 @@ line|z19-[highway=busway],
 
 line|z13-[highway=pedestrian],
 line|z13-[highway=ford]
-{color: @pedestrian;opacity: 0.9;}
-
+{color: @pedestrian;opacity: 0.85;}
 line|z13-[highway=cycleway],
 line|z14-[highway=path][bicycle=designated]::cycleline,
 line|z15-[highway=footway][bicycle=designated]::cycleline,
 {color: @cycleway;}
-
-line|z14-[highway=path][bicycle=designated]::cycleline,
-{dashes: 7,9.6;}
-line|z16[highway=path][bicycle=designated]::cycleline,
-{dashes: 7.5,9.5;}
-line|z17[highway=path][bicycle=designated]::cycleline,
-{dashes: 8,9.4;}
-line|z18[highway=path][bicycle=designated]::cycleline,
-{dashes: 8.5,9.3;}
-line|z19-[highway=path][bicycle=designated]::cycleline,
-{dashes: 9,9.2;}
-
-
 line|z13-[highway=construction],
 {color: @construction;opacity: 0.7;}
 line|z13-[highway=pedestrian][bridge?]::bridgewhite,
@@ -737,9 +679,9 @@ line|z15-[leisure=track][!area],
 line|z14-[highway=bridleway]
 {color: @bridleway;opacity: 0.6;}
 line|z15-[highway=footway],
-{color: @footway;opacity: 0.87;}
+{color: @footway;opacity: 0.75;}
 line|z15-[highway=steps],
-{color: @footway;opacity: 0.9;}
+{color: @footway;opacity: 0.85;}
 line|z14-[highway=path],
 {color: @path;opacity: 0.6;}
 line|z14-[highway=path][_path_grade=expert],
@@ -769,25 +711,25 @@ line|z17-[highway=steps][tunnel?]::tunnelCasing,
 
 line|z13[highway=pedestrian],
 line|z13[highway=ford]
-{width: 1;dashes: 4,1;}
+{width: 1;dashes: 2,1;}
 line|z14[highway=pedestrian],
 line|z14[highway=ford]
-{width: 1.6;dashes: 6,1.3;}
+{width: 1.6;dashes: 3.6,1.6;}
 line|z15[highway=pedestrian],
 line|z15[highway=ford]
-{width: 2;dashes: 8,1.5;}
+{width: 2;dashes: 5,2.2;}
 line|z16[highway=pedestrian],
 line|z16[highway=ford]
-{width: 2.4;dashes: 8,1.5;}
+{width: 2.4;dashes: 5.4,2.7;}
 line|z17[highway=pedestrian],
 line|z17[highway=ford]
-{width: 3;dashes: 9,1.8;}
+{width: 3;dashes: 5,2;}
 line|z18[highway=pedestrian],
 line|z18[highway=ford]
-{width: 4;dashes: 11,2.3;opacity: 1;}
+{width: 4;dashes: 7,3;opacity: 1;}
 line|z19-[highway=pedestrian],
 line|z19-[highway=ford]
-{width: 5;dashes: 13,2.7;opacity: 1;}
+{width: 5;dashes: 16.2,8.1;opacity: 1;}
 
 /* 8.2 Pedestrian & ford tunnel 16-22 ZOOM */
 
@@ -815,54 +757,50 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack,
 /* 8.4 Cycleway 13-22 ZOOM */
 
 line|z13[highway=cycleway],
-{opacity: 0.5;}
+{opacity: 0.3;}
 line|z14[highway=cycleway],
 line|z14[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.6;}
+{opacity: 0.4;}
 line|z15[highway=cycleway],
 line|z15[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.8;}
+{opacity: 0.5;}
 line|z16-17[highway=cycleway],
 line|z16-17[highway=path][bicycle=designated]::cycleline,
-{opacity: 0.9;}
+{opacity: 0.6;}
 line|z18-[highway=cycleway],
 line|z18-[highway=path][bicycle=designated]::cycleline,
-{opacity: 1;}
+{opacity: 0.8;}
 
-line|z15-[highway=footway][bicycle=designated]::cycleline,
-{opacity: 1;}
+line|z15-16[highway=footway][bicycle=designated]::cycleline,
+{opacity: 0.4;}
+line|z17-[highway=footway][bicycle=designated]::cycleline,
+{opacity: 0.5;}
 
 line|z13[highway=cycleway]
-{width: 1.0;}
+{width: 0.9;}
 line|z14[highway=cycleway],
 line|z14[highway=path][bicycle=designated]::cycleline,
-{width: 1.2;}
-line|z15[highway=cycleway],
-line|z15[highway=path][bicycle=designated]::cycleline,
-{width: 1.5;}
-line|z16[highway=cycleway],
-line|z16[highway=path][bicycle=designated]::cycleline,
-{width: 2;}
-line|z17[highway=cycleway],
-line|z17[highway=path][bicycle=designated]::cycleline,
-{width: 2.4;}
-line|z18[highway=cycleway],
-line|z18[highway=path][bicycle=designated]::cycleline,
-{width: 3.2;}
-line|z19-[highway=cycleway],
-line|z19-[highway=path][bicycle=designated]::cycleline,
-{width: 4.2;}
-
-line|z15[highway=footway][bicycle=designated]::cycleline,
-{width: 0.7;}
-line|z16[highway=footway][bicycle=designated]::cycleline,
-{width: 0.8;}
-line|z17[highway=footway][bicycle=designated]::cycleline,
 {width: 1.1;}
-line|z18[highway=footway][bicycle=designated]::cycleline,
+line|z15[highway=cycleway]
+line|z15[highway=footway][bicycle=designated]::cycleline,
+line|z15[highway=path][bicycle=designated]::cycleline,
+{width: 1.2;}
+line|z16[highway=cycleway],
+line|z16[highway=footway][bicycle=designated]::cycleline,
+line|z16[highway=path][bicycle=designated]::cycleline,
+{width: 1.3;}
+line|z17[highway=cycleway],
+line|z17[highway=footway][bicycle=designated]::cycleline,
+line|z17[highway=path][bicycle=designated]::cycleline,
 {width: 1.4;}
+line|z18[highway=cycleway],
+line|z18[highway=footway][bicycle=designated]::cycleline,
+line|z18[highway=path][bicycle=designated]::cycleline,
+{width: 1.6;}
+line|z19-[highway=cycleway],
 line|z19-[highway=footway][bicycle=designated]::cycleline,
-{width: 2.0;}
+line|z19-[highway=path][bicycle=designated]::cycleline,
+{width: 1.8;}
 
 line|z17[highway=cycleway][tunnel?]::tunnelBackground
 {casing-width-add: 1;}
@@ -1015,26 +953,26 @@ line|z17-[highway=track][bridge?]::bridgeblack
 /* 8.7 Footway 15-22 ZOOM */
 
 line|z15[highway=footway]
-{width: 1.5; dashes: 5,1.5;}
+{width: 1.5; dashes: 5,2;}
 line|z16[highway=footway]
-{width: 2; dashes: 5,1.5;}
+{width: 2; dashes: 5,2;}
 line|z17[highway=footway]
-{width: 2.4; dashes: 6,1.8;}
+{width: 2.4; dashes: 6,2.5;}
 line|z18[highway=footway]
-{width: 3.2; dashes: 8,2.3; opacity: 1;}
+{width: 3.2; dashes: 8,3; opacity: 1;}
 line|z19-[highway=footway],
-{width: 4.2; dashes: 10,2.7;opacity: 1;}
+{width: 4.2; dashes: 10,3.5; opacity: 1;}
 
 line|z15[highway=footway][bicycle=designated],
-{width: 1.5; dashes: 6,9; opacity: 0.8;}
+{width: 1.5; dashes: 5,3;}
 line|z16[highway=footway][bicycle=designated],
-{width: 2; dashes: 8,10; opacity: 0.9;}
+{width: 2; dashes: 5,3;}
 line|z17[highway=footway][bicycle=designated],
-{width: 2.4; dashes: 10,11; opacity: 1;}
+{width: 2.4; dashes: 6,4.2; opacity: 0.9;}
 line|z18[highway=footway][bicycle=designated],
-{width: 3.2; dashes: 15,15; opacity: 1;}
+{width: 3.2; dashes: 8,5.5; opacity: 1;}
 line|z19-[highway=footway][bicycle=designated],
-{width: 4.2; dashes: 20,20; opacity: 1;}
+{width: 4.2; dashes: 10,6.7; opacity: 1;}
 
 /* Don't display sidewalks and pedestrian crossings on z15. */
 line|z15[highway=footway][footway=sidewalk],

data/styles/default/include/priorities_3_FG.prio.txt

@@ -45,6 +45,10 @@ power-line                                          # line z19- (also has line::
 power-line::dash                                    # line::dash z19- (also has line z19-)
 === 340
 
+highway-cycleway                                    # line z13- (also has pathtext z15-)
+highway-cycleway-bridge                             # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-cycleway-tunnel                             # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-crossing                            # line z16-
 highway-steps                                       # line z15- (also has pathtext z16-)
 highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
 highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
@@ -188,23 +192,16 @@ highway-secondary_link-tunnel                       # line z13- (also has line(c
 === 224
 
 # highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
+# === 223
+
 highway-tertiary_link                               # line z14- (also has pathtext z18-)
 highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
 highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
-=== 223
-
-highway-busway                                      # line z15- (also has pathtext z16-)
-highway-busway-bridge                               # line z15- (also has pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has pathtext z16-)
-highway-service                                     # line z15- (also has pathtext z16-)
-highway-service-area                                # line z15- (also has pathtext z16-)
-highway-service-bridge                              # line z15- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
-highway-service-tunnel                              # line z15- (also has pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
 === 222
 
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
+# === 221
+
 railway-light_rail::dash                            # line::dash z16- (also has line z13-)
 railway-light_rail-bridge::dash                     # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail::dash                                  # line::dash z16- (also has line z11-)
@@ -221,19 +218,8 @@ railway-rail-utility-bridge::dash                   # line::dash z17- (also has
 railway-rail-utility-tunnel::dash                   # line::dash z17- (also has line z13-, line(casing) z14-)
 railway-subway::dash                                # line::dash z16- (also has line z13-)
 railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
-=== 221
-
-highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, pathtext z15-)
 === 220
 
-highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, pathtext z15-)
-=== 219
-
-highway-cycleway                                    # line z13- (also has pathtext z15-)
-highway-cycleway-bridge                             # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-cycleway-tunnel                             # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 218
-
 railway-light_rail                                  # line z13- (also has line::dash z16-)
 railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
 railway-rail                                        # line z11- (also has line::dash z16-)
@@ -268,7 +254,15 @@ highway-pedestrian-tunnel                           # line z13- (also has line(c
 # highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
 # === 199
 
-highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z14-, pathtext z15-)
+highway-busway                                      # line z15- (also has pathtext z16-)
+highway-busway-bridge                               # line z15- (also has pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has pathtext z16-)
+highway-service                                     # line z15- (also has pathtext z16-)
+highway-service-area                                # line z15- (also has pathtext z16-)
+highway-service-bridge                              # line z15- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
+highway-service-tunnel                              # line z15- (also has pathtext z16-)
 === 190
 
 highway-bridleway                                   # line z14- (also has pathtext z15-)
@@ -276,7 +270,7 @@ highway-bridleway-bridge                            # line z14- (also has line::
 highway-bridleway-tunnel                            # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 highway-footway                                     # line z15- (also has pathtext z15-)
 highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
-highway-footway-crossing                            # line z16-
+highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, pathtext z15-)
 highway-path                                        # line z14- (also has pathtext z15-)
 highway-path-bicycle                                # line z14- (also has line::cycleline z14-, pathtext z15-)
 highway-path-difficult                              # line z14- (also has pathtext z15-)
@@ -289,6 +283,10 @@ highway-track-no-access                             # line z14- (also has pathte
 highway-track-tunnel                                # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 === 180
 
+highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, pathtext z15-)
+highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z14-, pathtext z15-)
+=== 170
+
 highway-construction                                # line z13- (also has pathtext z15-)
 leisure-track                                       # line z15- (also has caption z16-)
 railway-abandoned                                   # line z16-

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -668,9 +668,6 @@ highway-residential-bridge::shield                  # shield::shield z15- (also
 highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
 === 2955
 
-highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
-=== 2954
-
 highway-cycleway                                    # pathtext z15- (also has line z13-)
 highway-cycleway-bridge                             # pathtext z15- (also has line z13-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-cycleway-tunnel                             # pathtext z15- (also has line z13-, line::tunnelBackground z17-, line::tunnelCasing z17-)
@@ -679,6 +676,7 @@ highway-cycleway-tunnel                             # pathtext z15- (also has li
 area:highway-footway                                # caption z15- (also has area z14-)
 highway-footway                                     # pathtext z15- (also has line z15-)
 highway-footway-area                                # pathtext z15- (also has line z15-, area z14-)
+highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
 highway-footway-bridge                              # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 highway-tertiary_link                               # pathtext z18- (also has line z14-)

data/styles/default/light/colors.mapcss

@@ -3,16 +3,16 @@
 1.BASEMAP
 2.BOUNDARY
 3.NATURAL
-  3.1 Main natural
-  3.2 Vegetation
+	3.1 Main natural
+	3.2 Vegetation
 4.LANDUSE
-  4.1 Main landuse
-  4.2 Aerodrome
+	4.1 Main landuse
+	4.2 Aerodrome
   4.3 Barriers
   4.4 Buildings
 5.ROADS
   5.1 All roads
-  5.2 Bridges
+	5.2 Bridges
   5.3 Tunnels
   5.4 Piste
   5.5 Transport
@@ -26,7 +26,7 @@
 
 /* 1.BASEMAP */
 
-@background: #F5E8D6;
+@background: #E3E1D2;
 
 /* 2.BOUNDARY */
 
@@ -38,108 +38,103 @@
 /* 3.1 Main natural */
 
 @glacier: #FFFFFF;
-@water: #8AD8E7;
-@water_bad: #95C5B8;
-@river: #5FB4C5;
-@wetland: #C3E0D1;
-@beach: #FFE7B7;
+@water: #8BD3E0;
+@water_bad: #9dc7c1;
+@river: #36B0BF;
+@wetland: #c9ddd6;
+@beach: #FCEC7E;
 @barerock: #D9D2BF;
 @scree: #CCC7BA;
-@desert: #F6E5CE;
+@desert: #EEE5B2;
 
 /*3.2 Vegetation*/
 
-@heath: #CED797;
-@green0: #C8D48C;
-@green1: #C4D181;
-@green1b: #BECC76;
-@green2: #B6C96B;
-@green3: #B0C763;
-@green4: #B2C76A;
-@green5: #ADC45F;
-@forest: #A8BE5C;
-@green6: #7B8F35;
-@flowers: #B6C96B;
+@green0: #CFD5A8;
+@green1: #C6CF93;
+@green1b: #C1CC89;
+@green2: #BCC87E;
+@green3: #B3C471;
+@green4: #AEC26B;
+@green5: #B0C270;
+@forest: #AABF65;
+@green6: #888C38;
+@flowers: #B3C471;
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
 
-@pedestrian_area: #F6EBDC;
-@pedestrian_area_light: #F7EDDF;
-@university: #F8E3C2;
-@hospital: #FFDAD6;
-@industrial: #E8E6E1;
-@sport0: #F5EED3;
-@sport1: #E8E8C3;
-@sport2: #D4E796;
-@parking: #F6F0E9;
+@pedestrian_area: #EDE8D6;
+@pedestrian_area_light: #F2EEDA;
+@university: #F8E4BA;
+@hospital: #F8D9D9;
+@industrial: #E4E2EB;
+@sport0: #DDD9B0;
+@sport1: #D7D3AC;
+@sport2: #D1CDA7;
+@parking: #F2F2BC;
 @military: #E53935;
 @prison: #727272;
-@farmland: #E4E0AD;
-@farmyard: #E6D6AF;
+@farmland: #E4DEAD;
+@farmyard: #E5D6AC;
 
 /*4.2 Aerodrome*/
 
-@aerodrome0: #CED4D2;
-@aerodrome1: #CED4D2;
-@aerodrome2: #CBD1CF;
-@aerodrome3: #C6CCCA;
-@aerodrome4: #C4C9C8;
-@aerodrome5: #C1C7C5;
+@aerodrome0: #D4BFF2;
+@aerodrome1: #D4BFF2;
+@aerodrome2: #D1C0EB;
+@aerodrome3: #CFC1E8;
+@aerodrome4: #CDC0E3;
+@aerodrome5: #C8BCDE;
 
 /* 4.3 Barriers */
 @fence: #888888;
-@hedge: #95A852;
+@hedge: #8DB880;
 @cliff: #8C5826;
 
 /* 4.4 Buildings */
 
-@building0: #D5D6D2;
-@building1: #D0D1CC;
+@building0: #C9C8BB;
+@building1: #C2C0B3;
 @building_border0: #A1A096;
 @building_border1: #9B9A8F;
 
 /* 5.ROADS */
 /* 5.1 All roads */
 
-@motorway0: #F57A00;
-@motorway1: #F08800;
-@trunk0: #F29718;
-@trunk1: #F29E30;
-@primary0: #F5B74E;
-@primary1: #FABB40;
-@primary2: #FAC256;
-@secondary0: #FFCE5A;
-@secondary1: #FFD573;
+@trunk0: #FF7326;
+@trunk1: #FF7A26;
+@primary0:  #FF8726;
+@primary1: #FF9440;
+@primary2: #FFA14C;
+@secondary0: #FFB226;
+@secondary1: #FFBF52;
 @tertiary: #FFFFFF;
-@residential: #FFFEFE;
-@pedestrian: #FFFAF5;
-@footway: #FFFAF5;
-@cycleway: #6F6DFF;
-@construction: #C1A06B;
+@residential: #F8F8F8;
+@pedestrian: #F8F8F8;
+@footway: #F8F8F8;
+@cycleway: #5654FF;
+@construction: #BBBBAA;
 @track: #635730;
-@path: #8E4E1D;
+@path: #A05012;
 @path_expert: #3D2617;
 @bridleway: #3D361E;
 
 /* 5.2 Bridges */
 
-@bridge_background: #FCF1DE;
-@bridge_casing: #E1D4BE;
+@bridge_background: #EDEBDB;
+@bridge_casing: #808080;
 
 /* 5.3 Tunnels */
 
-@motorway_tunnel: #F2A540;
-@motorway_tunnel_casing: #808080;
-@trunk_tunnel: #F6BB5F;
+@trunk_tunnel: #FCA462;
 @trunk_tunnel_casing: #808080;
-@primary_tunnel: #F6CB85;
+@primary_tunnel: #FCA462;
 @primary_tunnel_casing: #808080;
-@secondary_tunnel: #F9D393;
+@secondary_tunnel: #FFBF52;
 @secondary_tunnel_casing:  #808080;
 @tertiary_tunnel: #FFFFFF;
 @tertiary_tunnel_casing:  #808080;
-@residential_tunnel: #FFFEFE;
+@residential_tunnel: #FFFFFF;
 @residential_tunnel_casing: #808080;
 
 /* 5.4 Piste */
@@ -154,15 +149,15 @@
 
 /* 5.5 Transport */
 
-@railway_light: #B0B1A4;
-@railway: #96968B;
+@railway_light: #B2B1A2;
+@railway: #969586;
 @railway_tourism: #9C7D65;
 @railway_dash: #EEEEEE;
 @railway_tunnel: #808080;
 @aerialway: #444444;
 @powerline: #969586;
 @tram: #7A7A7A;
-@ferry: #59A2AF;
+@ferry: #4499Bb;
 
 /* 6.LABELS COLORS */
 /* 6.1 Main labels */
@@ -174,7 +169,7 @@
 
 /* 6.2 Natural labels */
 
-@water_label: #278FA2;
+@water_label: #4499Bb;
 @park_label: #3A7921;
 @halo_park_label: #FFFFFF;
 

data/styles/default/light/symbols/bar-m.svg

@@ -3,7 +3,7 @@
  <g fill="none" fill-rule="evenodd">
   <g id="bar-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#EC955E"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
    <path id="🔹-Icon-Color" d="m18 6.9667c0-0.53333-0.43333-0.96667-0.96667-0.96667h-10.067c-0.53333 0-0.96667 0.43333-0.96667 0.96667 0 0.23333 0.086667 0.46667 0.24667 0.64l5.0867 5.7267v3.3333h-2.6667c-0.36667 0-0.66667 0.3-0.66667 0.66667 0 0.36667 0.3 0.66667 0.66667 0.66667h6.6667c0.36667 0 0.66667-0.3 0.66667-0.66667 0-0.36667-0.3-0.66667-0.66667-0.66667h-2.6667v-3.3333l5.0867-5.7267c0.16-0.17333 0.24667-0.40667 0.24667-0.64zm-9.0467 1.7-1.18-1.3333h8.46l-1.1867 1.3333h-6.0933z" fill="#fff"/>
   </g>
  </g>

data/styles/default/light/symbols/cafe-m.svg

@@ -3,7 +3,7 @@
  <g fill="none" fill-rule="evenodd">
   <g id="cafe-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#EC955E"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
    <path id="Shape" d="m15.889 7h-8.8889v5.5556c0 1.2278 0.99444 2.2222 2.2222 2.2222h3.3333c1.2278 0 2.2222-0.99444 2.2222-2.2222v-1.6667h1.1111c0.61667 0 1.1111-0.5 1.1111-1.1111v-1.6667c0-0.61667-0.49444-1.1111-1.1111-1.1111zm0 2.7778h-1.1111v-1.6667h1.1111v1.6667zm-8.8889 6.1111h8.8889v1.1111h-8.8889v-1.1111z" fill="#fff"/>
   </g>
  </g>

data/styles/default/light/symbols/fastfood-m.svg

@@ -3,7 +3,7 @@
  <g fill="none" fill-rule="evenodd">
   <g id="fastfood-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#EC955E"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
    <g id="Group" transform="translate(5 6)" fill="#fff">
     <path id="Path" d="m0.959 7.896c0.553-0.203 0.819-0.546 1.393-0.546 0.833 0 0.994 0.7 2.331 0.7 1.365 0 1.463-0.7 2.331-0.7 0.833 0 0.994 0.7 2.331 0.7 1.365 0 1.463-0.7 2.331-0.7 0.567 0 0.819 0.322 1.351 0.532 0.469 0.182 0.973-0.175 0.973-0.672 0-0.301-0.196-0.567-0.483-0.672-0.679-0.245-0.854-0.581-1.855-0.581-1.365 0-1.463 0.7-2.331 0.7-0.833 0-0.994-0.7-2.331-0.7-1.365 0-1.463 0.7-2.331 0.7-0.833 0-0.994-0.7-2.331-0.7-1.085 0-1.372 0.441-1.876 0.623-0.273 0.098-0.455 0.364-0.455 0.658 0 0.483 0.49 0.826 0.952 0.658z"/>
     <path id="Path" d="m0 11.2c0 0.77 0.63 1.4 1.4 1.4h11.2c0.77 0 1.4-0.63 1.4-1.4v-0.7c0-0.77-0.63-1.4-1.4-1.4h-11.2c-0.77 0-1.4 0.63-1.4 1.4v0.7z"/>

data/styles/default/light/symbols/ice_cream-m.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#EC955E"/>
+ <circle cx="12" cy="12" r="11" fill="#bb9342"/>
  <path d="m12.049 5.3147c-1.902 0-3.5057 1.3566-3.8631 3.1738-0.93283 0.34526-1.5879 1.2414-1.5879 2.2772 0 1.3386 1.0851 2.4218 2.4238 2.4218 0.60736 0.0071 1.0136-0.18667 1.4042-0.3496 0.50275 0.22412 1.0536 0.3496 1.623 0.3496 0.57544 0 1.1396-0.12704 1.6484-0.36327 0.32914 0.16064 0.82873 0.36216 1.3808 0.36327 1.3386 0 2.4238-1.0831 2.4238-2.4218 0-1.0358-0.65506-1.932-1.5879-2.2772-0.35738-1.8172-1.9631-3.1738-3.8651-3.1738zm1.707 8.7282c-0.52703 0.30792-1.109 0.47264-1.705 0.47264-0.58984 0-1.1609-0.16489-1.6816-0.45702-0.37309 0.19579-0.78848 0.34937-1.3437 0.36522l2.3906 4.7831c0.11234 0.22468 0.33902 0.36522 0.59177 0.36522 0.25276 0 0.47944-0.14054 0.59178-0.36522l2.4257-4.8514c-0.48744-0.03354-0.98887-0.14016-1.2695-0.31249z" fill="#fff"/>
 </svg>

data/styles/default/light/symbols/nightclub-m.svg

@@ -1,5 +1,5 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#EC955E"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
   <path d="m18.289 5.5406c0.20956 0.15523 0.33374 0.40359 0.33374 0.6649v8.6928c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-3.7669l-6.6231 1.9869v5.3864c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-5.9142c0-0.36479 0.2406-0.68818 0.58987-0.79426l8.2789-2.4837c0.25095-0.075029 0.5226-0.02848 0.73216 0.12936z" fill="#fff"/>
 </svg>

data/styles/default/light/symbols/pub-m.svg

@@ -3,7 +3,7 @@
  <g fill="none" fill-rule="evenodd">
   <g id="beer-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#EC955E"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
    <path id="Shape" d="m16.116 10.413h-0.9863c0.22129-0.37302 0.35406-0.80295 0.35406-1.2645 0-1.3973-1.1317-2.529-2.529-2.529-0.21496 0-0.41728 0.031612-0.6196 0.082192-0.51844-0.42993-1.176-0.70179-1.9094-0.70179-1.1949 0-2.2192 0.70179-2.6997 1.7134-0.99895 0.33509-1.726 1.2708-1.726 2.3836 0 1.176 0.80927 2.156 1.8967 2.4405v5.4626h6.9547v-1.2645h1.2645c0.69547 0 1.2645-0.56902 1.2645-1.2645v-3.7935c0-0.69547-0.56902-1.2645-1.2645-1.2645zm-7.5869 0.94837c-0.69547 0-1.2645-0.56902-1.2645-1.2645 0-0.53741 0.34773-1.0116 0.86617-1.1886l0.5058-0.17071 0.22761-0.48051c0.29715-0.61328 0.89146-0.99262 1.5616-0.99262 0.49947 0 0.87882 0.22129 1.1001 0.41096l0.49315 0.41096s0.40464-0.20232 0.9294-0.20232c0.69547 0 1.2645 0.56902 1.2645 1.2645h-1.8967c-2.0991 0-2.4278 2.2129-3.7871 2.2129zm7.5869 4.1096h-1.2645v-3.7935h1.2645v3.7935z" fill="#fff"/>
   </g>
  </g>

data/styles/default/light/symbols/restaurant-m.svg

@@ -3,7 +3,7 @@
  <g fill="none" fill-rule="evenodd">
   <g id="restaurant-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#EC955E"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
    <path id="Shape" d="m10.75 9.55v-2.9478c0-0.33259-0.26509-0.60221-0.59571-0.60221h-0.058575c-0.329 0-0.59571 0.27856-0.59571 0.60221v2.9478h-1.25v-2.9478c0-0.33259-0.26509-0.60221-0.59571-0.60221h-0.058575c-0.329 0-0.59571 0.27856-0.59571 0.60221v2.9478c0 1.378 1.25 2.45 2.4375 2.45l-0.16221 5.1908c-0.013966 0.4469 0.32885 0.80919 0.76779 0.80919h0.16385c0.438 0 0.77819-0.35736 0.75936-0.80919l-0.21628-5.1908c1.25 0 2.75-1.072 2.5-2.45v-2.9478c0-0.33259-0.26509-0.60221-0.59571-0.60221h-0.058575c-0.329 0-0.59571 0.27856-0.59571 0.60221v2.9478h-1.25zm3.25 3.25h1.5v4.455c0 0.41147 0.3329 0.74503 0.75 0.74503 0.41421 0 0.75-0.33347 0.75-0.75065v-11.249c-2.094 0-3.05 1.456-3 2.6v4.2z" fill="#fff"/>
   </g>
  </g>

data/styles/default/light/symbols/stripclub-m.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#EC955E"/>
+ <circle cx="12" cy="12" r="11" fill="#BB9342"/>
  <path d="m2.0024 15.579 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756z" fill="#fff"/>
 </svg>

data/styles/outdoors/include/Roads.mapcss

@@ -103,9 +103,10 @@ line|z11-[highway=bridleway],
 {color: @path; opacity: 1;}
 
 line|z11-[highway=cycleway],
-line|z13-[highway=footway][bicycle=designated]::cycleline,
 line|z12-[highway=path][bicycle=designated]::cycleline,
 {color: @cycleway; opacity: 1;}
+line|z13-[highway=footway][bicycle=designated]::cycleline,
+{color: @cycleway; opacity: 0.8;}
 
 line|z11[highway=track],
 {width: 1.1; dashes: 6,2.5; opacity: 0.6;}
@@ -167,37 +168,27 @@ line|z13-[highway=footway][bicycle=designated],
 {opacity: 0.8;}
 
 line|z12[highway=path][bicycle=designated],
+line|z12[highway=footway][bicycle=designated],
 {width: 1.1; dashes: 3.5,2.5; opacity: 0.7;}
 line|z13[highway=path][bicycle=designated],
+line|z13[highway=footway][bicycle=designated],
 {width: 1.3; dashes: 4,3;}
 line|z14[highway=path][bicycle=designated],
+line|z14[highway=footway][bicycle=designated],
 {width: 1.6; dashes: 4,3;}
 line|z15[highway=path][bicycle=designated],
+line|z15[highway=footway][bicycle=designated],
 {width: 2; dashes: 6,4.5;}
 line|z16[highway=path][bicycle=designated],
+line|z16[highway=footway][bicycle=designated],
 {width: 2.6; dashes: 6,4.5;}
 line|z17[highway=path][bicycle=designated],
+line|z17[highway=footway][bicycle=designated],
 {width: 3.3; dashes: 8,6;}
 line|z18-[highway=path][bicycle=designated],
+line|z18-[highway=footway][bicycle=designated],
 {width: 4; dashes: 8,6; opacity: 1;}
 
-line|z12[highway=footway][bicycle=designated],
-{width: 1.1; dashes: 2,6; opacity: 0.7;}
-line|z13[highway=footway][bicycle=designated],
-{width: 1.3; dashes: 3,7;}
-line|z14[highway=footway][bicycle=designated],
-{width: 1.6; dashes: 4,8;}
-line|z15[highway=footway][bicycle=designated],
-{width: 2; dashes: 6,9; opacity: 0.8;}
-line|z16[highway=footway][bicycle=designated],
-{width: 2.6; dashes: 8,10; opacity: 0.9;}
-line|z17[highway=footway][bicycle=designated],
-{width: 3.3; dashes: 10,11; opacity: 1;}
-line|z18[highway=footway][bicycle=designated],
-{width: 4; dashes:  15,15; opacity: 1;}
-line|z19-[highway=footway][bicycle=designated],
-{width: 4; dashes: 20,20; opacity: 1;}
-
 line|z11[highway=path][_path_grade=difficult],
 line|z11[highway=path][_path_grade=expert],
 {width: 1; dashes: 1,2; opacity: 0.7;}
@@ -256,42 +247,32 @@ line|z18-[highway=bridleway],
 line|z11[highway=cycleway],
 {width: 0.9; opacity: 0.7;}
 line|z12[highway=cycleway],
-{width: 1.1; opacity: 0.7;}
+line|z12[highway=path][bicycle=designated]::cycleline,
+{width: 1; opacity: 0.7;}
 line|z13[highway=cycleway],
-line|z13[highway=path][bicycle=designated]::cycleline,
-{width: 1.3; opacity: 0.8;}
-line|z14[highway=cycleway],
-line|z14[highway=path][bicycle=designated]::cycleline,
-{width: 1.6;}
-line|z15[highway=cycleway],
-line|z15[highway=path][bicycle=designated]::cycleline,
-{width: 2;}
-line|z16[highway=cycleway],
-line|z16[highway=path][bicycle=designated]::cycleline,
-{width: 2.6;}
-line|z17[highway=cycleway],
-line|z17[highway=path][bicycle=designated]::cycleline,
-{width: 3.3;}
-line|z18-[highway=cycleway],
-line|z18-[highway=path][bicycle=designated]::cycleline,
-{width: 4;}
-
-line|z13-[highway=footway][bicycle=designated]::cycleline,
-{opacity: 1;}
 line|z13[highway=footway][bicycle=designated]::cycleline,
-{width: 0.5;}
+line|z13[highway=path][bicycle=designated]::cycleline,
+{width: 1.1; opacity: 0.8;}
+line|z14[highway=cycleway],
 line|z14[highway=footway][bicycle=designated]::cycleline,
-{width: 0.6;}
+line|z14[highway=path][bicycle=designated]::cycleline,
+{width: 1.3;}
+line|z15[highway=cycleway],
 line|z15[highway=footway][bicycle=designated]::cycleline,
-{width: 0.7;}
+line|z15[highway=path][bicycle=designated]::cycleline,
+{width: 1.5;}
+line|z16[highway=cycleway],
 line|z16[highway=footway][bicycle=designated]::cycleline,
-{width: 0.8;}
+line|z16[highway=path][bicycle=designated]::cycleline,
+{width: 1.7;}
+line|z17[highway=cycleway],
 line|z17[highway=footway][bicycle=designated]::cycleline,
-{width: 1.1;}
-line|z18[highway=footway][bicycle=designated]::cycleline,
-{width: 1.4;}
-line|z19-[highway=footway][bicycle=designated]::cycleline,
-{width: 2.0;}
+line|z17[highway=path][bicycle=designated]::cycleline,
+{width: 2;}
+line|z18-[highway=cycleway],
+line|z18-[highway=footway][bicycle=designated]::cycleline,
+line|z18-[highway=path][bicycle=designated]::cycleline,
+{width: 2.4;}
 
 
 /* Ski pistes */

data/styles/outdoors/include/priorities_3_FG.prio.txt

@@ -47,12 +47,6 @@ power-line::dash                                    # line::dash z13- (also has
 power-minor_line::dash                              # line::dash z15- (also has line z15-)
 === 340
 
-highway-footway-bicycle                             # line z11- (also has line::cycleline z13-, pathtext z13-)
-=== 332
-
-highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, pathtext z13-)
-=== 331
-
 highway-cycleway                                    # line z11- (also has pathtext z13-)
 highway-cycleway-bridge                             # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-cycleway-tunnel                             # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
@@ -278,8 +272,9 @@ highway-bridleway-bridge                            # line z11- (also has line::
 highway-bridleway-tunnel                            # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 highway-footway                                     # line z11- (also has pathtext z13-)
 highway-footway-area                                # line z11- and area z14- (also has pathtext z13-)
+highway-footway-bicycle                             # line z11- (also has line::cycleline z13-, pathtext z13-)
 highway-path                                        # line z11- (also has pathtext z13-)
-highway-path-bicycle                                # line z11- (also has line::cycleline z13-, pathtext z13-)
+highway-path-bicycle                                # line z11- (also has line::cycleline z12-, pathtext z13-)
 highway-path-difficult                              # line z11- (also has pathtext z13-)
 highway-path-expert                                 # line z11- (also has pathtext z13-)
 highway-raceway                                     # line z14- (also has pathtext z16-)
@@ -290,7 +285,8 @@ highway-track-no-access                             # line z11- (also has pathte
 highway-track-tunnel                                # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 === 180
 
-highway-path-bicycle::cycleline                     # line::cycleline z13- (also has line z11-, pathtext z13-)
+highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, pathtext z13-)
+highway-path-bicycle::cycleline                     # line::cycleline z12- (also has line z11-, pathtext z13-)
 === 170
 
 highway-construction                                # line z11- (also has pathtext z15-)

data/styles/outdoors/include/priorities_4_overlays.prio.txt

@@ -668,9 +668,6 @@ highway-residential-bridge::shield                  # shield::shield z15- (also
 highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
 === 2955
 
-highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::cycleline z13-)
-=== 2954
-
 highway-cycleway                                    # pathtext z13- (also has line z11-)
 highway-cycleway-bridge                             # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-cycleway-tunnel                             # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
@@ -679,6 +676,7 @@ highway-cycleway-tunnel                             # pathtext z13- (also has li
 area:highway-footway                                # caption z15- (also has area z14-)
 highway-footway                                     # pathtext z13- (also has line z11-)
 highway-footway-area                                # pathtext z13- (also has line z11-, area z14-)
+highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::cycleline z13-)
 highway-footway-bridge                              # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 highway-tertiary_link                               # pathtext z18- (also has line z14-)
@@ -708,7 +706,7 @@ highway-bridleway                                   # pathtext z13- (also has li
 highway-bridleway-bridge                            # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-bridleway-tunnel                            # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 highway-path                                        # pathtext z13- (also has line z11-)
-highway-path-bicycle                                # pathtext z13- (also has line z11-, line::cycleline z13-)
+highway-path-bicycle                                # pathtext z13- (also has line z11-, line::cycleline z12-)
 highway-path-bridge                                 # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-path-difficult                              # pathtext z13- (also has line z11-)
 highway-path-expert                                 # pathtext z13- (also has line z11-)

data/styles/outdoors/light/colors.mapcss

@@ -34,9 +34,6 @@
 
 @cycleway: #534DEB; /* slightly darker than in main */
 
-@pedestrian: #FFFFFF; /* slightly lighter than in main */
-@footway: #FFFFFF; /* slightly lighter than in main */
-
 @construction: #ABAB9A;
 
 /* 5.5 Transport */

docs/INSTALL.md

@@ -11,18 +11,27 @@
 
 To build and run CoMaps you'll need a machine with at least 4Gb of RAM and 20-30Gb of disk space depending on your target platform. Expect to download 2-5Gb of files.
 
+For _Windows_ you need to have [Git for Windows](https://git-scm.com/download/win) installed and Git bash available in the PATH.
+
 ## Getting sources
 
 First of all get the source code. The full CoMaps sources repository is ~3Gb in size, there are various [clone options](#special-cases-options) to reduce the download size to suit your needs.
 
-Clone the repository including all submodules (see [Special cases options](#special-cases-options) below)
+For _Windows_, it's necessary to enable symlink support:
+1. Activate _Windows Development Mode_ to enable symlinks globally:
+  - Windows 10: _Settings_ -> _Update and Security_ -> _For Developers_ -> _Activate Developer Mode_
+  - Windows 11: _Settings_ -> _Privacy and Security_ -> _For Developers_ -> _Activate Developer Mode_
+  - Press Win + R, run `ms-settings:developers` and _Activate Developer Mode_
+2. Enable [symlinks](https://git-scm.com/docs/git-config#Documentation/git-config.txt-coresymlinks) support in git. The easiest way is to reinstall the latest [Git for Windows](https://git-scm.com/download/win) with the "Enable Symlinks" checkbox checked. If you don't want to reinstall Git, then you can add `-c core.symlinks=true` parameter to the clone command below to enable symlinks for the repository.
+
+```bash
+git config --global core.symlinks true
+```
+
+Clone the repository including all submodules (see [Special cases options](#special-cases-options) below):
 
 (if you plan to contribute and propose pull requests then use a web interface at https://codeberg.org/comaps/comaps to fork the repository first and use your fork's URL in the command below)
 
-Follow the instructions for your OS, and afterwards the repository is prepared to build a CoMaps app!
-
-### Linux
-Clone the repository
 ```bash
 git clone --recurse-submodules --shallow-submodules https://codeberg.org/comaps/comaps.git
 ```
@@ -45,25 +54,6 @@ Configure the repository (make sure you have a working C++ build environment):
 bash ./configure.sh
 ```
 
-### Windows
-You need to have [Git for Windows](https://git-scm.com/download/win) installed and Git bash available in the PATH.
-
-It's necessary to enable symlink support:
-1. Activate _Windows Development Mode_ to enable symlinks globally:
-  - Windows 10: _Settings_ -> _Update and Security_ -> _For Developers_ -> _Activate Developer Mode_
-  - Windows 11: _Settings_ -> _Privacy and Security_ -> _For Developers_ -> _Activate Developer Mode_
-  - Press Win + R, run `ms-settings:developers` and _Activate Developer Mode_
-2. Enable [symlinks](https://git-scm.com/docs/git-config#Documentation/git-config.txt-coresymlinks) support in git. The easiest way is to reinstall the latest [Git for Windows](https://git-scm.com/download/win) with the "Enable Symlinks" checkbox checked. If you don't want to reinstall Git, then you can add `-c core.symlinks=true` parameter to the clone command below to enable symlinks for the repository.
-
-```bash
-git config --global core.symlinks true
-```
-
-Clone the repository
-```bash
-git clone --recurse-submodules --shallow-submodules https://codeberg.org/comaps/comaps.git
-```
-
 For _Windows 10_:  You should be able to build the project by following either of these setup methods:
 
 **Setup 1: Using WSL**
@@ -79,30 +69,7 @@ For _Windows 10_:  You should be able to build the project by following either o
 "C:\Program Files\Git\bin\bash.exe" configure.sh # execute the script by using Developer Command Prompt
 ```
 
-### macOS
-Install required build dependencies and Xcode
-1. Install Xcode Command Line Tools
-2. Install [Xcode](https://apps.apple.com/app/xcode/id497799835?mt=12) from the App Store
-3. Install [Homebrew](https://brew.sh) and required dependencies
-4. Clone and configure the repository to be able to build the iOS app later
-
-#### Xcode Command Line Tools
-```bash
-xcode-select --install
-```
-
-#### Homebrew packages
-```bash
-brew install wget optipng
-```
-
-#### Clone and configure repository
-Clone the repository
-```bash
-git clone --recurse-submodules --shallow-submodules https://codeberg.org/comaps/comaps.git
-cd comaps
-bash ./configure.sh
-```
+Now the repository is prepared to build a CoMaps app!
 
 ### Special cases options
 
@@ -368,7 +335,13 @@ Building CoMaps for iOS requires a Mac.
 
 Ensure that you have at least 20GB of free space.
 
-Perform the steps in [getting all sources](#getting-sources), including configuring the repository
+After [getting all sources](#getting-sources), please make sure that Command Line Tools are installed:
+
+```bash
+xcode-select --install
+```
+
+Then, install [Xcode](https://apps.apple.com/app/xcode/id497799835?mt=12) from the App Store.
 
 Enroll in the [Apple Developer Program](https://developer.apple.com/programs/) (you can run CoMaps in Simulator without this step).
 

iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings

@@ -6,7 +6,7 @@
 "type.aerialway.chair_lift" = "مصعد مقعدي";
 "type.aerialway.drag_lift" = "مصعد الجر";
 "type.aerialway.gondola" = "غندول";
-"type.aerialway.mixed_lift" = "رفع مختلط";
+"type.aerialway.mixed_lift" = "Mixed Lift";
 "type.aerialway.station" = "محطة تلفريك";
 "type.aeroway" = "بنية الطيران";
 "type.aeroway.aerodrome" = "مطار";
@@ -43,7 +43,7 @@
 "type.amenity.charging_station" = "محطة شحن";
 "type.amenity.charging_station.bicycle" = "محطة شحن الدراجات";
 "type.amenity.charging_station.motorcar" = "محطة شحن السيارات";
-"type.amenity.childcare" = "حضّانة";
+"type.amenity.childcare" = "حضانة";
 "type.amenity.cinema" = "سينما";
 "type.leisure.bowling_alley" = "صالة بولينج";
 "type.amenity.clinic" = "عيادة";
@@ -60,7 +60,7 @@
 "type.amenity.exhibition_centre" = "مركز المعرض";
 "type.amenity.money_transfer" = "تحويل المال";
 "type.amenity.music_school" = "مدرسة موسيقى";
-"type.amenity.language_school" = "مدرسة لغات";
+"type.amenity.language_school" = "مدرسة لغة";
 "type.office.diplomatic" = "سفارة";
 "type.amenity.fast_food" = "وجبات سريعة";
 "type.amenity.ferry_terminal" = "محطة عبّارات";
@@ -1484,5 +1484,3 @@
 
 /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */
 "type.leisure.sports_hall" = "الصالة الرياضية";
-"type.amenity.love_hotel" = "فندق جب";
-"type.amenity.studio" = "معرض";

iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings

@@ -158,7 +158,7 @@
 "type.amenity.shelter.basic_hut" = "ビバーク小屋";
 
 /* A traditional 3-walled shelter (one side open), suitable for overnight camping. */
-"type.amenity.shelter.lean_to" = "三壁の避難所";
+"type.amenity.shelter.lean_to" = "Lean-to Shelter";
 "type.amenity.public_bath" = "公衆浴場";
 "type.amenity.shower" = "シャワー";
 "type.amenity.stripclub" = "ストリップクラブ";
@@ -179,14 +179,14 @@
 "type.amenity.vending_machine.parking_tickets" = "駐車券支払機";
 "type.amenity.vending_machine.public_transport_tickets" = "公共交通機関の券売機";
 "type.amenity.vending_machine.sweets" = "お菓子の自動販売機";
-"type.amenity.vending_machine.excrement_bags" = "うんち袋の自販機";
-"type.amenity.parcel_locker" = "宅配ロッカー";
+"type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
+"type.amenity.parcel_locker" = "Parcel Locker";
 "type.amenity.vehicle_inspection" = "車検";
 "type.amenity.vending_machine.fuel" = "燃料ポンプ";
 "type.amenity.veterinary" = "獣医";
 "type.amenity.waste_basket" = "ゴミ箱";
 "type.amenity.waste_disposal" = "ゴミ";
-"type.amenity.waste_transfer_station" = "ゴミ処理場";
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
 "type.amenity.water_point" = "給水所";
 "type.amenity.water_point.drinking_water_no" = "給水所";
 "type.barrier" = "障害物";

iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings

@@ -179,8 +179,8 @@
 "type.amenity.vending_machine.parking_tickets" = "違規停車罰單繳費機";
 "type.amenity.vending_machine.public_transport_tickets" = "公共交通售票機";
 "type.amenity.vending_machine.sweets" = "糖果售賣機";
-"type.amenity.vending_machine.excrement_bags" = "撿便袋販賣機";
-"type.amenity.parcel_locker" = "智取櫃";
+"type.amenity.vending_machine.excrement_bags" = "排泄物袋售賣機";
+"type.amenity.parcel_locker" = "包裹儲物櫃";
 "type.amenity.vehicle_inspection" = "車輛檢驗";
 "type.amenity.vending_machine.fuel" = "燃油泵";
 "type.amenity.veterinary" = "獸醫";

iphone/metadata/tr/description.txt

@@ -1 +0,0 @@
-Gönüllüler tarafından yürütülen, OpenStreetMap harita verisini kullanan, şeffaf, mahremiyete saygılı, kamu yararına olma kararlılığıyla güçlendirilmiş bir özgür yazılım.

iphone/metadata/tr/marketing_url.txt

@@ -1 +0,0 @@
-https://comaps.app/

iphone/metadata/tr/name.txt

@@ -1 +0,0 @@
-CoMaps - Mahremiyetli Yolculuk

iphone/metadata/tr/privacy_url.txt

@@ -1 +0,0 @@
-https://comaps.app/privacy

iphone/metadata/tr/promotional_text.txt

@@ -1 +0,0 @@
-Uygulamadan veya OpenStreetMap internet sitesi üzerinden harita verisini güncelleyin, geri bildirim sağlayın veya hataları bildirin, gündelik yaşamınızda kullanın ve adını çevrenize yayın - ekibimize katın ve en iyi haritalar uygulamasını yapmamıza yardım edin!

iphone/metadata/tr/subtitle.txt

@@ -1 +0,0 @@
-Seyahat edin, Yürüyüş yapın, Bisiklete binin, Sürüş yapın

iphone/metadata/tr/support_url.txt

@@ -1 +0,0 @@
-https://codeberg.org/comaps/comaps/issues