First attempt at allowing Android users to open/import MWMs directly

Signed-off-by: zyphlar <zyphlar@gmail.com>

android/app/src/main/AndroidManifest.xml

@@ -346,6 +346,60 @@
         <data android:mimeType="text/xml" />
       </intent-filter>
 
+      <!-- Custom MWM map files -->
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data android:scheme="content"/>
+        <data android:scheme="file"/>
+        <data android:host="*"/>
+        <data android:mimeType="*/*"/>
+        <!-- See http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i -->
+        <data android:pathPattern="/.*\\.mwm" />
+        <data android:pathPattern="/.*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
+      </intent-filter>
+
+      <!-- Duplicate without mimeType for MWM files -->
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data android:scheme="content"/>
+        <data android:scheme="file"/>
+        <data android:host="*"/>
+        <data android:pathPattern="/.*\\.mwm" />
+        <data android:pathPattern="/.*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
+        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
+      </intent-filter>
+
     </activity>
 
     <activity

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

@@ -331,6 +331,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     final IntentProcessor[] mIntentProcessors = {
+        new Factory.MwmFileProcessor(),
         new Factory.UrlProcessor(),
         new Factory.KmzKmlProcessor(),
     };

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

@@ -473,7 +473,16 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       {
         mName.setText(mItem.name);
         if (!mItem.isExpandable())
-          UiUtils.setTextAndHideIfEmpty(mSubtitle, mItem.description);
+        {
+          // Show version info for downloaded maps (in "My Maps" mode)
+          String subtitle = mItem.description;
+          if (mMyMapsMode && mItem.present && mItem.localVersion > 0)
+          {
+            String versionStr = formatVersion(mItem.localVersion);
+            subtitle = TextUtils.isEmpty(subtitle) ? "v" + versionStr : subtitle + " • v" + versionStr;
+          }
+          UiUtils.setTextAndHideIfEmpty(mSubtitle, subtitle);
+        }
       }
 
       if (mItem.isExpandable())
@@ -509,6 +518,21 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       }
       return size;
     }
+
+    /**
+     * Formats a version number (YYMMDD) into a readable date string (YY.MM.DD).
+     */
+    private String formatVersion(long version)
+    {
+      if (version <= 0)
+        return "";
+      String v = String.valueOf(version);
+      // Pad with leading zeros if needed
+      while (v.length() < 6)
+        v = "0" + v;
+      // Format as YY.MM.DD
+      return v.substring(0, 2) + "." + v.substring(2, 4) + "." + v.substring(4, 6);
+    }
   }
 
   static class HeaderViewHolder extends BaseInnerViewHolder<String>

android/app/src/main/java/app/organicmaps/intent/Factory.java

@@ -23,10 +23,12 @@ import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.util.StorageUtils;
 import app.organicmaps.sdk.util.concurrency.ThreadPool;
+import app.organicmaps.sdk.downloader.CustomMwmManager;
 import app.organicmaps.search.SearchActivity;
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 public class Factory
 {
@@ -65,6 +67,92 @@ public class Factory
     }
   }
 
+  public static class MwmFileProcessor implements IntentProcessor
+  {
+    private static final String MWM_EXTENSION = ".mwm";
+
+    @Override
+    public boolean process(@NonNull Intent intent, @NonNull MwmActivity activity)
+    {
+      if (!Intent.ACTION_VIEW.equals(intent.getAction()))
+        return false;
+
+      final Uri uri = intent.getData();
+      if (uri == null)
+        return false;
+
+      // Check if this is an MWM file
+      if (!isMwmFile(activity, uri))
+        return false;
+
+      // Import the MWM file on a background thread
+      ThreadPool.getStorage().execute(() -> {
+        CustomMwmManager.ImportResult result = CustomMwmManager.importMwmFile(activity, uri);
+
+        // Show result on UI thread
+        activity.runOnUiThread(() -> {
+          switch (result)
+          {
+            case SUCCESS:
+              android.widget.Toast.makeText(activity,
+                  activity.getString(app.organicmaps.R.string.custom_mwm_import_success),
+                  android.widget.Toast.LENGTH_LONG).show();
+              // Reload maps to include the new custom map
+              Framework.nativeReloadWorldMaps();
+              break;
+            case ERROR_INVALID_FILE:
+              android.widget.Toast.makeText(activity,
+                  activity.getString(app.organicmaps.R.string.custom_mwm_import_invalid),
+                  android.widget.Toast.LENGTH_LONG).show();
+              break;
+            case ERROR_IO:
+            case ERROR_STORAGE:
+              android.widget.Toast.makeText(activity,
+                  activity.getString(app.organicmaps.R.string.custom_mwm_import_error),
+                  android.widget.Toast.LENGTH_LONG).show();
+              break;
+          }
+        });
+      });
+
+      return true;
+    }
+
+    private boolean isMwmFile(@NonNull MwmActivity activity, @NonNull Uri uri)
+    {
+      String fileName = null;
+
+      // Try to get filename from content resolver
+      if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme()))
+      {
+        try (android.database.Cursor cursor = activity.getContentResolver().query(
+            uri, new String[]{android.provider.OpenableColumns.DISPLAY_NAME}, null, null, null))
+        {
+          if (cursor != null && cursor.moveToFirst())
+          {
+            int nameIndex = cursor.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME);
+            if (nameIndex >= 0)
+              fileName = cursor.getString(nameIndex);
+          }
+        }
+        catch (Exception ignored) {}
+      }
+
+      // Fallback to URI path
+      if (fileName == null)
+      {
+        String path = uri.getPath();
+        if (path != null)
+        {
+          int lastSlash = path.lastIndexOf('/');
+          fileName = lastSlash >= 0 ? path.substring(lastSlash + 1) : path;
+        }
+      }
+
+      return fileName != null && fileName.toLowerCase(Locale.US).endsWith(MWM_EXTENSION);
+    }
+  }
+
   public static class UrlProcessor implements IntentProcessor
   {
     private static final int SEARCH_IN_VIEWPORT_ZOOM = 16;

android/app/src/main/res/drawable/ic_track_recording_off.xml

@@ -3,9 +3,8 @@
   android:width="74dp"
   android:height="57dp"
   android:viewportWidth="74"
-  android:viewportHeight="57"
-  android:tint="?iconTint">
+  android:viewportHeight="57">
   <path
-    android:fillColor="#FFFFFF"
-    android:pathData="m26.278,8.137c3.695,-3.729 9.719,-3.761 13.453,-0.073 3.736,3.687 3.769,9.699 0.074,13.425L25.208,36.215c-2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048L48.119,30.283c-0.155,-0.32 -0.286,-0.647 -0.394,-0.978l-4.006,0.001c-2.787,0 -3.659,-3.825 -1.045,-5.042L65.323,13.832c2.091,-0.869 4.357,1.392 3.486,3.478L58.355,39.913c-1.219,2.607 -5.053,1.736 -5.053,-1.044V34.451c-0.506,-0.122 -1.006,-0.296 -1.494,-0.525L37.505,48.354C33.137,52.76 26.02,52.798 21.604,48.44 17.191,44.082 17.152,36.979 21.52,32.573L36.117,17.847c1.68,-1.693 1.665,-4.426 -0.033,-6.102 -1.7,-1.677 -4.437,-1.662 -6.117,0.033l-9.43,9.516c0.436,0.994 0.679,2.091 0.679,3.244 0,4.464 -3.634,8.091 -8.108,8.091C8.633,32.629 5,29.002 5,24.538c0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012z" />
+    android:fillColor="#757575"
+    android:pathData="m26.278,8.137c3.695,-3.729 9.719,-3.761 13.453,-0.073 3.736,3.687 3.769,9.699 0.074,13.425l-14.597,14.726c-2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048l14.303,-14.428c-0.155,-0.32 -0.286,-0.647 -0.394,-0.978l-4.006,0.001c-2.787,0 -3.659,-3.825 -1.045,-5.042l7.813,-3.604c0.879,-0.652 1.87,-1.098 2.9,-1.333l11.936,-5.495c2.091,-0.869 4.357,1.392 3.486,3.478l-10.454,22.603c-1.219,2.607 -5.053,1.736 -5.053,-1.044v-4.418c-0.506,-0.122 -1.006,-0.296 -1.494,-0.525l-14.303,14.428c-4.368,4.406 -11.485,4.444 -15.901,0.086 -4.413,-4.358 -4.452,-11.461 -0.084,-15.867l14.597,-14.726c1.68,-1.693 1.665,-4.426 -0.033,-6.102 -1.7,-1.677 -4.437,-1.662 -6.117,0.033l-9.43,9.516c0.436,0.994 0.679,2.091 0.679,3.244 0,4.464 -3.634,8.091 -8.108,8.091 -4.475,0 -8.108,-3.627 -8.108,-8.091 0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012z" />
 </vector>

android/app/src/main/res/drawable/ic_track_recording_on.xml

@@ -6,9 +6,9 @@
   android:viewportHeight="80">
     <path
       android:pathData="m4.858,10.076c0,-5.523 4.477,-10 10,-10h60c5.523,0 10,4.477 10,10v60c0,5.523 -4.477,10 -10,10h-60c-5.523,0 -10,-4.477 -10,-10z"
-      android:fillColor="@color/base_red"
+      android:fillColor="@color/active_track_recording"
       android:fillAlpha="0.78" />
     <path
-      android:pathData="m33.024,19.508c3.955,-3.981 10.402,-4.015 14.399,-0.078 3.999,3.937 4.034,10.355 0.079,14.333L31.879,49.485c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051L56.401,43.152c-0.166,-0.342 -0.306,-0.691 -0.422,-1.044l-4.288,0.001c-2.983,0 -3.916,-4.084 -1.118,-5.383L74.814,25.588c2.238,-0.928 4.663,1.486 3.731,3.713L67.356,53.433c-1.305,2.783 -5.408,1.854 -5.408,-1.115V47.601c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561L45.04,62.444C40.365,67.148 32.747,67.189 28.021,62.536 23.298,57.883 23.256,50.299 27.931,45.595L43.554,29.873c1.798,-1.808 1.782,-4.725 -0.035,-6.515 -1.819,-1.79 -4.749,-1.774 -6.547,0.035l-10.093,10.16c0.467,1.061 0.727,2.232 0.727,3.464 0,4.766 -3.89,8.638 -8.678,8.638 -4.79,0 -8.678,-3.872 -8.678,-8.638 0,-4.768 3.888,-8.638 8.678,-8.638 1.524,0 2.958,0.392 4.204,1.081z"
+      android:pathData="m33.024,19.508c3.955,-3.981 10.402,-4.015 14.399,-0.078 3.999,3.937 4.034,10.355 0.079,14.333l-15.623,15.722c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051l15.309,-15.404c-0.166,-0.342 -0.306,-0.691 -0.422,-1.044l-4.288,0.001c-2.983,0 -3.916,-4.084 -1.118,-5.383l8.362,-3.848c0.941,-0.696 2.001,-1.172 3.104,-1.423l12.775,-5.867c2.238,-0.928 4.663,1.486 3.731,3.713l-11.189,24.132c-1.305,2.783 -5.408,1.854 -5.408,-1.115l-0,-4.717c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561l-15.309,15.404c-4.675,4.704 -12.293,4.745 -17.019,0.092 -4.723,-4.653 -4.765,-12.237 -0.09,-16.941l15.623,-15.722c1.798,-1.808 1.782,-4.725 -0.035,-6.515 -1.819,-1.79 -4.749,-1.774 -6.547,0.035l-10.093,10.16c0.467,1.061 0.727,2.232 0.727,3.464 0,4.766 -3.89,8.638 -8.678,8.638 -4.79,0 -8.678,-3.872 -8.678,-8.638 0,-4.768 3.888,-8.638 8.678,-8.638 1.524,0 2.958,0.392 4.204,1.081z"
       android:fillColor="#ffffff"/>
 </vector>

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

@@ -12,7 +12,7 @@
     android:tint="?iconTint"
     app:srcCompat="@drawable/ic_plus"
     app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Minus"
-    android:layout_marginBottom="@dimen/margin_eighth_plus"
+    android:layout_marginBottom="@dimen/margin_eighth"
     android:contentDescription="@string/zoom_in"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     android:id="@+id/nav_zoom_out"

android/app/src/main/res/values/dimens.xml

@@ -8,7 +8,6 @@
 
   <!-- margins -->
   <dimen name="margin_eighth">2dp</dimen>
-  <dimen name="margin_eighth_plus">3dp</dimen>
   <dimen name="margin_quarter">4dp</dimen>
   <dimen name="margin_quarter_plus">6dp</dimen>
   <dimen name="margin_half">8dp</dimen>

android/app/src/main/res/values/strings.xml

@@ -975,4 +975,8 @@
     <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
     <string name="download_resources_custom_url_summary_none">Not set</string>
     <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
+    <!-- Custom MWM file import messages -->
+    <string name="custom_mwm_import_success">Custom map imported successfully. Restart the app to load it.</string>
+    <string name="custom_mwm_import_invalid">Invalid MWM file. Please select a valid map file.</string>
+    <string name="custom_mwm_import_error">Failed to import the map file. Please try again.</string>
 </resources>

android/sdk/src/main/cpp/app/organicmaps/sdk/MapManager.cpp

@@ -67,8 +67,8 @@ struct CountryItemBuilder
   jclass m_class;
   jmethodID m_ctor;
   jfieldID m_Id, m_Name, m_DirectParentId, m_TopmostParentId, m_DirectParentName, m_TopmostParentName, m_Description,
-      m_Size, m_EnqueuedSize, m_TotalSize, m_ChildCount, m_TotalChildCount, m_Present, m_Progress, m_DownloadedBytes,
-      m_BytesToDownload, m_Category, m_Status, m_ErrorCode;
+      m_Size, m_EnqueuedSize, m_TotalSize, m_LocalVersion, m_ChildCount, m_TotalChildCount, m_Present, m_Progress,
+      m_DownloadedBytes, m_BytesToDownload, m_Category, m_Status, m_ErrorCode;
 
   CountryItemBuilder(JNIEnv * env)
   {
@@ -85,6 +85,7 @@ struct CountryItemBuilder
     m_Size = env->GetFieldID(m_class, "size", "J");
     m_EnqueuedSize = env->GetFieldID(m_class, "enqueuedSize", "J");
     m_TotalSize = env->GetFieldID(m_class, "totalSize", "J");
+    m_LocalVersion = env->GetFieldID(m_class, "localVersion", "J");
     m_ChildCount = env->GetFieldID(m_class, "childCount", "I");
     m_TotalChildCount = env->GetFieldID(m_class, "totalChildCount", "I");
     m_Present = env->GetFieldID(m_class, "present", "Z");
@@ -221,6 +222,9 @@ static void UpdateItem(JNIEnv * env, jobject item, storage::NodeAttrs const & at
   env->SetLongField(item, ciBuilder.m_EnqueuedSize, attrs.m_downloadingMwmSize);
   env->SetLongField(item, ciBuilder.m_TotalSize, attrs.m_mwmSize);
 
+  // Local version (YYMMDD format)
+  env->SetLongField(item, ciBuilder.m_LocalVersion, attrs.m_localMwmVersion);
+
   // Child counts
   env->SetIntField(item, ciBuilder.m_ChildCount, attrs.m_downloadingMwmCounter);
   env->SetIntField(item, ciBuilder.m_TotalChildCount, attrs.m_mwmCounter);

android/sdk/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java

@@ -53,6 +53,9 @@ public final class CountryItem implements Comparable<CountryItem>
   public long enqueuedSize;
   public long totalSize;
 
+  // Local MWM file version (YYMMDD format, e.g. 251231). 0 if not downloaded.
+  public long localVersion;
+
   public int childCount;
   public int totalChildCount;
 
@@ -155,7 +158,7 @@ public final class CountryItem implements Comparable<CountryItem>
   + "\", category: \"" + category + "\", name: \"" + name + "\", directParentName: \"" + directParentName
   + "\", topmostParentName: \"" + topmostParentName + "\", present: " + present + ", status: " + status
   + ", errorCode: " + errorCode + ", headerId: " + headerId + ", size: " + size + ", enqueuedSize: " + enqueuedSize
-  + ", totalSize: " + totalSize + ", childCount: " + childCount + ", totalChildCount: " + totalChildCount
-  + ", progress: " + StringUtils.formatUsingUsLocale("%.2f", progress) + "% }";
+  + ", totalSize: " + totalSize + ", localVersion: " + localVersion + ", childCount: " + childCount
+  + ", totalChildCount: " + totalChildCount + ", progress: " + StringUtils.formatUsingUsLocale("%.2f", progress) + "% }";
   }
 }

android/sdk/src/main/java/app/organicmaps/sdk/downloader/CustomMwmManager.java

@@ -0,0 +1,359 @@
+package app.organicmaps.sdk.downloader;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import app.organicmaps.sdk.Framework;
+import app.organicmaps.sdk.util.StorageUtils;
+import app.organicmaps.sdk.util.log.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Manages custom MWM map files that are manually imported by the user.
+ * Custom maps are stored in dated folders (YYMMDD format) and take precedence
+ * over downloaded maps when loading.
+ */
+public class CustomMwmManager
+{
+  private static final String TAG = CustomMwmManager.class.getSimpleName();
+  private static final String CUSTOM_MAPS_DIR = "custom_maps";
+  private static final String MWM_EXTENSION = ".mwm";
+  private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyMMdd", Locale.US);
+
+  public enum ImportResult
+  {
+    SUCCESS,
+    ERROR_INVALID_FILE,
+    ERROR_IO,
+    ERROR_STORAGE
+  }
+
+  /**
+   * Represents a custom MWM file with its metadata.
+   */
+  public static class CustomMwmFile
+  {
+    public final String name;       // e.g., "Portland"
+    public final String path;       // Full path to the file
+    public final long version;      // Date version as YYMMDD number
+    public final long fileSize;
+
+    public CustomMwmFile(String name, String path, long version, long fileSize)
+    {
+      this.name = name;
+      this.path = path;
+      this.version = version;
+      this.fileSize = fileSize;
+    }
+  }
+
+  /**
+   * Gets the custom maps root directory path.
+   */
+  @NonNull
+  public static String getCustomMapsDir(@NonNull Context context)
+  {
+    String writableDir = Framework.nativeGetWritableDir();
+    return StorageUtils.addTrailingSeparator(writableDir) + CUSTOM_MAPS_DIR;
+  }
+
+  /**
+   * Gets or creates the custom maps directory for today's date.
+   * @return The directory path, or null if creation failed.
+   */
+  @Nullable
+  public static String getTodayCustomMapsDir(@NonNull Context context)
+  {
+    String customMapsDir = getCustomMapsDir(context);
+    String today = DATE_FORMAT.format(new Date());
+    String todayDir = StorageUtils.addTrailingSeparator(customMapsDir) + today;
+
+    File dir = new File(todayDir);
+    if (!dir.exists() && !dir.mkdirs())
+    {
+      Logger.e(TAG, "Failed to create custom maps directory: " + todayDir);
+      return null;
+    }
+
+    return todayDir;
+  }
+
+  /**
+   * Imports an MWM file from a content URI into the custom maps directory.
+   * The file is saved in a dated folder based on today's date.
+   *
+   * @param context Application context
+   * @param uri     Content URI of the MWM file
+   * @return ImportResult indicating success or the type of error
+   */
+  @NonNull
+  public static ImportResult importMwmFile(@NonNull Context context, @NonNull Uri uri)
+  {
+    String fileName = getFileNameFromUri(context, uri);
+    if (fileName == null || !fileName.toLowerCase(Locale.US).endsWith(MWM_EXTENSION))
+    {
+      Logger.e(TAG, "Invalid file name or not an MWM file: " + fileName);
+      return ImportResult.ERROR_INVALID_FILE;
+    }
+
+    String destDir = getTodayCustomMapsDir(context);
+    if (destDir == null)
+    {
+      return ImportResult.ERROR_STORAGE;
+    }
+
+    File destFile = new File(destDir, fileName);
+    Logger.i(TAG, "Importing MWM file to: " + destFile.getAbsolutePath());
+
+    try
+    {
+      ContentResolver resolver = context.getContentResolver();
+      if (!StorageUtils.copyFile(resolver, uri, destFile))
+      {
+        Logger.e(TAG, "Failed to copy MWM file");
+        return ImportResult.ERROR_IO;
+      }
+
+      Logger.i(TAG, "Successfully imported MWM file: " + fileName);
+      return ImportResult.SUCCESS;
+    }
+    catch (IOException e)
+    {
+      Logger.e(TAG, "IOException while importing MWM file", e);
+      return ImportResult.ERROR_IO;
+    }
+  }
+
+  /**
+   * Gets the file name from a content URI.
+   */
+  @Nullable
+  private static String getFileNameFromUri(@NonNull Context context, @NonNull Uri uri)
+  {
+    String fileName = null;
+
+    if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme()))
+    {
+      try (android.database.Cursor cursor = context.getContentResolver().query(
+          uri, new String[]{android.provider.OpenableColumns.DISPLAY_NAME}, null, null, null))
+      {
+        if (cursor != null && cursor.moveToFirst())
+        {
+          int nameIndex = cursor.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME);
+          if (nameIndex >= 0)
+          {
+            fileName = cursor.getString(nameIndex);
+          }
+        }
+      }
+      catch (Exception e)
+      {
+        Logger.e(TAG, "Failed to get file name from URI", e);
+      }
+    }
+
+    if (fileName == null)
+    {
+      // Try to get from path
+      String path = uri.getPath();
+      if (path != null)
+      {
+        int lastSlash = path.lastIndexOf('/');
+        fileName = lastSlash >= 0 ? path.substring(lastSlash + 1) : path;
+      }
+    }
+
+    return fileName;
+  }
+
+  /**
+   * Lists all custom MWM files, grouped by map name with the newest version taking precedence.
+   * @return Map from country name to CustomMwmFile (newest version)
+   */
+  @NonNull
+  public static Map<String, CustomMwmFile> getCustomMwmFiles(@NonNull Context context)
+  {
+    Map<String, CustomMwmFile> result = new HashMap<>();
+    String customMapsDir = getCustomMapsDir(context);
+    File rootDir = new File(customMapsDir);
+
+    if (!rootDir.exists() || !rootDir.isDirectory())
+    {
+      return result;
+    }
+
+    File[] versionDirs = rootDir.listFiles(File::isDirectory);
+    if (versionDirs == null)
+    {
+      return result;
+    }
+
+    // Sort by version descending (newest first)
+    Arrays.sort(versionDirs, (a, b) -> {
+      long versionA = parseVersion(a.getName());
+      long versionB = parseVersion(b.getName());
+      return Long.compare(versionB, versionA);
+    });
+
+    for (File versionDir : versionDirs)
+    {
+      long version = parseVersion(versionDir.getName());
+      if (version <= 0)
+      {
+        continue;
+      }
+
+      File[] mwmFiles = versionDir.listFiles((dir, name) ->
+          name.toLowerCase(Locale.US).endsWith(MWM_EXTENSION));
+
+      if (mwmFiles == null)
+      {
+        continue;
+      }
+
+      for (File mwmFile : mwmFiles)
+      {
+        String name = mwmFile.getName();
+        // Remove .mwm extension to get country name
+        String countryName = name.substring(0, name.length() - MWM_EXTENSION.length());
+
+        // Only add if we don't already have a newer version
+        if (!result.containsKey(countryName))
+        {
+          result.put(countryName, new CustomMwmFile(
+              countryName,
+              mwmFile.getAbsolutePath(),
+              version,
+              mwmFile.length()
+          ));
+        }
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Gets all version directories in the custom maps folder, sorted by version descending.
+   * @return List of version directory paths
+   */
+  @NonNull
+  public static List<String> getCustomMapVersionDirs(@NonNull Context context)
+  {
+    List<String> result = new ArrayList<>();
+    String customMapsDir = getCustomMapsDir(context);
+    File rootDir = new File(customMapsDir);
+
+    if (!rootDir.exists() || !rootDir.isDirectory())
+    {
+      return result;
+    }
+
+    File[] versionDirs = rootDir.listFiles(File::isDirectory);
+    if (versionDirs == null)
+    {
+      return result;
+    }
+
+    // Sort by version descending (newest first)
+    Arrays.sort(versionDirs, (a, b) -> {
+      long versionA = parseVersion(a.getName());
+      long versionB = parseVersion(b.getName());
+      return Long.compare(versionB, versionA);
+    });
+
+    for (File versionDir : versionDirs)
+    {
+      if (parseVersion(versionDir.getName()) > 0)
+      {
+        result.add(StorageUtils.addTrailingSeparator(versionDir.getAbsolutePath()));
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Checks if a custom version of a map exists.
+   * @param countryName The country/map name (without .mwm extension)
+   * @return The CustomMwmFile if found, null otherwise
+   */
+  @Nullable
+  public static CustomMwmFile getCustomMwmFile(@NonNull Context context, @NonNull String countryName)
+  {
+    Map<String, CustomMwmFile> customFiles = getCustomMwmFiles(context);
+    return customFiles.get(countryName);
+  }
+
+  /**
+   * Deletes a custom MWM file.
+   * @param file The CustomMwmFile to delete
+   * @return true if deletion was successful
+   */
+  public static boolean deleteCustomMwmFile(@NonNull CustomMwmFile file)
+  {
+    File f = new File(file.path);
+    boolean deleted = f.delete();
+
+    if (deleted)
+    {
+      Logger.i(TAG, "Deleted custom MWM file: " + file.path);
+
+      // Clean up empty version directories
+      File parentDir = f.getParentFile();
+      if (parentDir != null)
+      {
+        String[] remaining = parentDir.list();
+        if (remaining != null && remaining.length == 0)
+        {
+          if (parentDir.delete())
+          {
+            Logger.i(TAG, "Deleted empty version directory: " + parentDir.getPath());
+          }
+        }
+      }
+    }
+    else
+    {
+      Logger.e(TAG, "Failed to delete custom MWM file: " + file.path);
+    }
+
+    return deleted;
+  }
+
+  /**
+   * Parses a version string (YYMMDD format) to a long.
+   * @return The version number, or 0 if parsing failed
+   */
+  private static long parseVersion(String versionStr)
+  {
+    if (versionStr == null || versionStr.length() != 6)
+    {
+      return 0;
+    }
+
+    try
+    {
+      return Long.parseLong(versionStr);
+    }
+    catch (NumberFormatException e)
+    {
+      return 0;
+    }
+  }
+
+}

data/styles/cycling/dark/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");

data/styles/cycling/include/basemap.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");

data/styles/cycling/include/basemap_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");

data/styles/cycling/include/icons.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");

data/styles/cycling/include/icons_label_colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");

data/styles/cycling/include/priorities_1_BG-by-size.prio.txt

@@ -1 +0,0 @@
-@import("../../default/include/priorities_1_BG-by-size.prio.txt")

data/styles/cycling/include/priorities_2_BG-top.prio.txt

@@ -1 +0,0 @@
-@import("../../default/include/priorities_2_BG-top.prio.txt")

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

@@ -1,10 +0,0 @@
-@import("../../default/include/priorities_3_FG.prio.txt")
-
-highway-tertiary
-highway-tertiary-bridge
-highway-tertiary-tunnel
-highway-unclassified
-highway-unclassified-area
-highway-unclassified-bridge
-highway-unclassified-tunnel
-=== 400

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

@@ -1 +0,0 @@
-@import("../../default/include/priorities_4_overlays.prio.txt")

data/styles/cycling/include/transit_systems.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/transit_systems.mapcss");

data/styles/cycling/include/ways.mapcss

@@ -1,52 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");
-
-line|z12-[highway=cycleway],
-line|z13-[highway=path][bicycle=designated]::cycleline,
-line|z14-[highway=footway][bicycle=designated]::cycleline,
-{color: @cycleway;}
-
-line|z12[highway=cycleway]
-{width: 1.9;}
-line|z13[highway=cycleway]
-{width: 2.0;}
-line|z14[highway=cycleway],
-{width: 2.2;}
-line|z15[highway=cycleway],
-{width: 2.5;}
-line|z16[highway=cycleway],
-{width: 3;}
-line|z17[highway=cycleway],
-{width: 3.4;}
-line|z18[highway=cycleway],
-{width: 4.2;}
-line|z19-[highway=cycleway],
-{width: 5.2;}
-
-line|z13[highway=path][bicycle=designated]::cycleline,
-{width: 1.4;}
-line|z14[highway=path][bicycle=designated]::cycleline,
-{width: 1.5;}
-line|z15[highway=path][bicycle=designated]::cycleline,
-{width: 1.6;}
-line|z16[highway=path][bicycle=designated]::cycleline,
-{width: 2.2;}
-line|z17[highway=path][bicycle=designated]::cycleline,
-{width: 2;}
-line|z18[highway=path][bicycle=designated]::cycleline,
-{width: 2.4;}
-line|z19-[highway=path][bicycle=designated]::cycleline,
-{width: 2.8;}
-
-line|z14[highway=footway][bicycle=designated]::cycleline,
-{width: 1.6;}
-line|z15[highway=footway][bicycle=designated]::cycleline,
-{width: 1.7;}
-line|z16[highway=footway][bicycle=designated]::cycleline,
-{width: 1.8;}
-line|z17[highway=footway][bicycle=designated]::cycleline,
-{width: 2.1;}
-line|z18[highway=footway][bicycle=designated]::cycleline,
-{width: 2.4;}
-line|z19-[highway=footway][bicycle=designated]::cycleline,
-{width: 3.0;}

data/styles/cycling/include/ways_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");

data/styles/cycling/light/colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/light/colors.mapcss");

data/styles/cycling/light/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("../../default/light/dynamic_colors.mapcss");

data/styles/default/dark/style.mapcss

@@ -1,9 +1,134 @@
 @import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("dynamic_colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
+colors
+{
+  GuiText-color: #FFFFFF;
+  GuiText-opacity: 0.7;
+  MyPositionAccuracy-color: #FFFFFF;
+  MyPositionAccuracy-opacity: 0.06;
+  Selection-color: #FFFFFF;
+  Selection-opacity: 0.64;
+  Route-color: #0087FF;
+  RouteOutline-color: #055FCD;
+  RouteTrafficG0-color: #5E0F0D;
+  RouteTrafficG1-color: #7F1311;
+  RouteTrafficG2-color: #7F1311;
+  RouteTrafficG3-color: #9E8216;
+  RouteTrafficG3-opacity: 0.0;
+  RoutePedestrian-color: #FFB94B;
+  RoutePedestrian-opacity: 0.7;
+  RouteBicycle-color: #FF4B8C;
+  RouteBicycle-opacity: 0.7;
+  RouteRuler-color: #924ab5;
+  RouteRuler-opacity: 0.7;
+  RoutePreview-color: #FFFFFF;
+  RoutePreview-opacity: 0.3;
+  RouteMaskCar-color: #000000;
+  RouteMaskCar-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskCar-color: #055FCD;
+  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
+  RouteArrowsMaskCar-color: #055FCD;
+  RouteArrowsMaskCar-opacity: 0.3;
+  RouteMaskBicycle-color: #000000;
+  RouteMaskBicycle-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C;
+  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
+  RouteArrowsMaskBicycle-color: #FF4B8C;
+  RouteArrowsMaskBicycle-opacity: 0.5;
+  RouteMaskPedestrian-color: #000000;
+  RouteMaskPedestrian-opacity: 0.5;
+  RouteFake-color: #A8A8A8;
+  RouteFakeOutline-color: #717171;
+  Arrow3D-color: #41C8FF;
+  Arrow3DObsolete-color: #82AAC8;
+  Arrow3DObsolete-opacity: 0.72;
+  Arrow3DShadow-color: #3C3C3C;
+  Arrow3DShadow-opacity: 0.24;
+  Arrow3DOutline-color: #FFFFFF;
+  TrackHumanSpeed-color: #FF9800;
+  TrackCarSpeed-color: #FFCA28;
+  TrackPlaneSpeed-color: #FFF5A0;
+  TrackUnknownDistance-color: #969696;
+  TrafficG0-color: #4C120F;
+  TrafficG1-color: #731816;
+  TrafficG2-color: #731816;
+  TrafficG3-color: #8C7012;
+  TrafficG3-opacity: 0.0;
+  TrafficG4-color: #376222;
+  TrafficG5-color: #376222;
+  TrafficTempBlock-color: #232323;
+  TrafficUnknown-color: #000000;
+  TrafficArrowLight-color: #C4C4C4;
+  TrafficArrowDark-color: #191919;
+  TrafficOutline-color: #383838;
+  RoadShieldBlackText-color: #212121;
+  RoadShieldWhiteText-color: #B7B6B6;
+  RoadShieldUKYellowText-color: #B49E0E;
+  RoadShieldWhiteBackground-color: #999999;
+  RoadShieldGreenBackground-color: #136C30;
+  RoadShieldBlueBackground-color: #294C88;
+  RoadShieldRedBackground-color: #9F1A17;
+  RoadShieldOrangeBackground-color: #B58E1B;
+  PoiHotelTextOutline-color: #000000;
+  PoiHotelTextOutline-opacity: 0.6;
+  PoiDeletedMask-color: #FFFFFF;
+  PoiDeletedMask-opacity: 0.3;
+  PoiVisitedMask-color: #FFFFFF;
+  PoiVisitedMask-opacity: 0.7;
+  DefaultTrackColor-color: #1E96F0;
+  RouteMarkPrimaryText-color: #888888;
+  RouteMarkPrimaryTextOutline-color: #000000;
+  RouteMarkSecondaryText-color: #888888;
+  RouteMarkSecondaryTextOutline-color: #000000;
+  TransitMarkPrimaryText-color: #888888;
+  TransitMarkPrimaryTextOutline-color: #000000;
+  TransitMarkSecondaryText-color: #888888;
+  TransitMarkSecondaryTextOutline-color: #000000;
+  TransitTransferOuterMarker-color: #000000;
+  TransitTransferInnerMarker-color: #888888;
+  TransitStopInnerMarker-color: #000000;
+  LocalAdsPrimaryText-color: #888888;
+  LocalAdsPrimaryTextOutline-color: #000000;
+  LocalAdsSecondaryText-color: #888888;
+  LocalAdsSecondaryTextOutline-color: #000000;
+  TransitBackground-color: #000000;
+  TransitBackground-opacity: 0.4;
+  BookmarkRed-color: #E51B23;
+  BookmarkPink-color: #FF4182;
+  BookmarkPurple-color: #9B24B2;
+  BookmarkDeepPurple-color: #6639BF;
+  BookmarkBlue-color: #0066CC;
+  BookmarkLightBlue-color: #249CF2;
+  BookmarkCyan-color: #14BECD;
+  BookmarkTeal-color: #00A58C;
+  BookmarkGreen-color: #3C8C3C;
+  BookmarkLime-color: #93BF39;
+  BookmarkYellow-color: #FFC800;
+  BookmarkOrange-color: #FF9600;
+  BookmarkDeepOrange-color: #F06432;
+  BookmarkBrown-color: #8C4E39;
+  BookmarkGray-color: #808080;
+  BookmarkBlueGray-color: #597380;
+  SearchmarkPreparing-color: #597380;
+  SearchmarkNotAvailable-color: #597380;
+  SearchmarkSelectedNotAvailable-color: #F06432;
+  RatingBad-color: #F06432;
+  RatingGood-color: #3C8C3C;
+  RatingNone-color: #249CF2;
+  SearchmarkDefault-color: #249CF2;
+  RatingText-color: #FFFFFF;
+  UGCRatingText-color: #B8B8B8;
+  SpeedCameraMarkText-color: #FFFFFF;
+  SpeedCameraMarkBg-color: #F51E30;
+  SpeedCameraMarkOutline-color: #FFFFFF;
+  GuideCityMarkText-color: #6639BF;
+  GuideOutdoorMarkText-color: #3C8C3C;
+  HotelPriceText-color: #000000;
+}

data/styles/default/include/Basemap.mapcss

@@ -1,6 +1,6 @@
 /* ~~~~ CONTENT OF BASEMAP ~~~~~
 
-1.BASICS
+1.Z-INDEX of BASEMAP
 2.LAND
 3.BOUNDARY
   3.1 Countries
@@ -28,35 +28,6 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
-
-/* 1. BASICS */
-
-way|z1-12::*
-{
-  linejoin: bevel;
-}
-
-way|z13-::*
-{
-  linejoin: round;
-}
-
-way|z1-15::*
-{
-  linecap: butt;
-}
-
-way|z16-::*
-{
-  linecap: round;
-}
-
-*::int_name
-{
-  text-offset: 1;
-}
-
-
 /* 2.LAND */
 
 area|z0-[natural=coastline],

data/styles/default/include/Icons.mapcss

@@ -22,6 +22,7 @@
  6.1 Craft
 7.CAR
  7.1 Parking
+8. COLORED LABELS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -2373,16 +2374,16 @@ area|z14-[highway=services],
 area|z15-[highway=rest_area],
 {text-position: center;}
 
-node|z15-[amenity=fuel],
-node|z17-[amenity=charging_station][motorcar?][!capacity],
-node|z17-[amenity=charging_station][motorcar?][capacity=1],
-node|z17-[amenity=charging_station][motorcar?][capacity=2],
-node|z16-[amenity=charging_station][motorcar?][capacity?],
+node|z14-[amenity=fuel],
+node|z15-[amenity=charging_station][motorcar?][!capacity],
+node|z15-[amenity=charging_station][motorcar?][capacity=1],
+node|z15-[amenity=charging_station][motorcar?][capacity=2],
+node|z14-[amenity=charging_station][motorcar?][capacity?],
 area|z14-[highway=services],
 area|z15-[highway=rest_area],
 area|z15-[landuse=garages],
 node|z15-[amenity=sanitary_dump_station],
-node|z18-[amenity=charging_station],
+node|z16-[amenity=charging_station],
 node|z17-[amenity=bicycle_parking],
 node|z17-[amenity=motorcycle_parking],
 node|z17-[amenity=car_wash],
@@ -2395,30 +2396,46 @@ node|z18-[amenity=car_sharing],
 area|z18-[landuse=garages],
 {font-size: 11;}
 
-node|z15-[amenity=fuel],
-{icon-image: fuel-m.svg; text-offset: 1;}
+node|z14[amenity=fuel],
+{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;}
+node|z15[amenity=fuel],
+{icon-image: fuel-m.svg; icon-min-distance: 20;}
+node|z16[amenity=fuel],
+{icon-image: fuel-m.svg; icon-min-distance: 10;}
+node|z17-[amenity=fuel],
+{icon-image: fuel-m.svg;}
+node|z18-[amenity=fuel],
+{font-size: 11;}
 
-node|z17-[amenity=charging_station][motorcar?],
-node|z18-[amenity=charging_station][motorcycle?],
-node|z18-[amenity=charging_station][bicycle?],
-node|z18-[amenity=charging_station][motorcar=not],
-node|z18-[amenity=charging_station],
+node|z15-[amenity=charging_station][motorcar?],
+node|z16-[amenity=charging_station][motorcycle?],
+node|z16-[amenity=charging_station][bicycle?],
+node|z16-[amenity=charging_station][motorcar=not],
+node|z16-[amenity=charging_station],
 {icon-image: charging_station-small-m.svg;}
 
-node|z16-[amenity=charging_station][motorcar?][capacity?],
+node|z14[amenity=charging_station][motorcar?][capacity?],
+{icon-image: charging_station-s.svg;}
+node|z15-[amenity=charging_station][motorcar?][capacity?],
 {icon-image: charging_station-m.svg;}
 
-node|z16[amenity=charging_station][motorcar?][!capacity],
-node|z16[amenity=charging_station][motorcar?][capacity=1],
-node|z16[amenity=charging_station][motorcar?][capacity=2],
+node|z14[amenity=charging_station][motorcar?][!capacity],
+node|z14[amenity=charging_station][motorcar?][capacity=1],
+node|z14[amenity=charging_station][motorcar?][capacity=2],
 {icon-image: none;}
-node|z17-[amenity=charging_station][motorcar?][!capacity],
-node|z17-[amenity=charging_station][motorcar?][capacity=1],
-node|z17-[amenity=charging_station][motorcar?][capacity=2],
+node|z15-[amenity=charging_station][motorcar?][!capacity],
+node|z15-[amenity=charging_station][motorcar?][capacity=1],
+node|z15-[amenity=charging_station][motorcar?][capacity=2],
 {icon-image: charging_station-small-m.svg;}
 
-node|z16[amenity=charging_station][motorcar?],
-{text-offset: 1;font-size: 10;}
+node|z14[amenity=charging_station][motorcar?],
+{text-offset: 1;font-size: 10;icon-min-distance: 20;}
+node|z15[amenity=charging_station][motorcar?],
+{icon-min-distance: 20;}
+node|z16[amenity=charging_station],
+{icon-min-distance: 10;}
+node|z18-[amenity=charging_station],
+{font-size: 11;}
 
 area|z14[highway=services],
 {icon-image: car-repair-s.svg; icon-min-distance: 20;}
@@ -2519,4 +2536,8 @@ node|z17-[amenity=motorcycle_parking],
 {icon-image: motorcycle-parking-m.svg;}
 
 node|z18-[amenity=parking_space][parking_space=disabled],
-{icon-image: parking-disabled-m.svg;}
+{icon-image: parking-disabled-m.svg;}
+
+/* 8. Colored Labels */
+
+@import("../../default/include/Icons_Label_Colors.mapcss");

data/styles/default/include/defaults_new.mapcss

@@ -0,0 +1,24 @@
+way|z1-12::*
+{
+  linejoin: bevel;
+}
+
+way|z13-::*
+{
+  linejoin: round;
+}
+
+way|z1-15::*
+{
+  linecap: butt;
+}
+
+way|z16-::*
+{
+  linecap: round;
+}
+
+*::int_name
+{
+  text-offset: 1;
+}

data/styles/default/include/priorities_1_BG-by-size.prio.txt

@@ -85,15 +85,15 @@ landuse-cemetery-christian                          # area z10- (also has icon z
 === 180
 
 amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station                            # area z16- (also has icon z18-, caption(optional) z18-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z18-, caption(optional) z18-)
-amenity-charging_station-carless                    # area z16- (also has icon z18-, caption(optional) z18-)
-amenity-charging_station-motorcar                   # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z18-, caption(optional) z18-)
-amenity-charging_station-small                      # area z15- (also has icon z17-, caption(optional) z18-)
+amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
 amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-fuel                                        # area z15- (also has icon z15-, caption(optional) z15-)
+amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
 amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
 amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
@@ -192,12 +192,12 @@ natural-shingle                                     # area z12-
 === 80
 
 landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
-leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-, caption z17-)
+leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
 leisure-garden-residential                          # area z12-
-leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
-leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
-leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
-leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
+leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
 === 70
 
 landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
@@ -234,7 +234,7 @@ amenity-college                                     # area z13- (also has icon z
 amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
 amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
 amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-, caption z14-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
 === 40
 
 aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)

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

@@ -114,7 +114,7 @@ natural-water-reservoir                             # caption z10- (also has are
 barrier-toll_booth                                  # icon z16- (also has caption(optional) z16-)
 === 6600
 
-historic-ruins                                      # icon z17- and caption z17- (also has caption(optional) z17-)
+historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 === 6551
 
 historic-castle                                     # icon z12- (also has caption(optional) z12-)
@@ -326,13 +326,13 @@ tourism-zoo                                         # icon z13- (also has captio
 === 5200
 
 amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z13-)
-amenity-university                                  # icon z14- and caption z14- (also has caption(optional) z14-, area z13-)
+amenity-university                                  # icon z14- (also has caption(optional) z14-, area z13-)
 leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z13-)
 === 5100
 
 leisure-marina                                      # icon z16- (also has caption(optional) z16-)
-leisure-park                                        # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
-leisure-park-permissive                             # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
+leisure-park                                        # icon z14- (also has caption(optional) z14-, area z10-)
+leisure-park-permissive                             # icon z14- (also has caption(optional) z14-, area z10-)
 mountain_pass                                       # icon z14- (also has caption(optional) z15-)
 place-square                                        # caption z16-
 === 5050
@@ -374,11 +374,11 @@ tourism-attraction                                  # icon z14- (also has captio
 tourism-gallery                                     # icon z15- (also has caption(optional) z15-)
 === 4300
 
-amenity-charging_station-small                      # icon z17- (also has caption(optional) z18-, area z15-)
+amenity-charging_station-small                      # icon z15- (also has caption(optional) z16-, area z15-)
 === 4280
 
-amenity-charging_station-motorcar                   # icon z16- (also has caption(optional) z16-, area z15-)
-amenity-fuel                                        # icon z15- (also has caption(optional) z15-, area z15-)
+amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
+amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
 === 4270
 
 highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
@@ -429,16 +429,16 @@ tourism-chalet                                      # icon z16- (also has captio
 shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
 === 3800
 
-amenity-charging_station-motorcycle                 # icon z18- (also has caption(optional) z18-, area z16-)
+amenity-charging_station-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
 === 3752
 
-amenity-charging_station-bicycle                    # icon z18- (also has caption(optional) z18-, area z16-)
+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
 === 3751
 
-amenity-charging_station                            # icon z18- (also has caption(optional) z18-, area z16-)
+amenity-charging_station                            # icon z16- (also has caption(optional) z16-, area z16-)
 === 3750
 
-amenity-charging_station-carless                    # icon z18- (also has caption(optional) z18-, area z16-)
+amenity-charging_station-carless                    # icon z16- (also has caption(optional) z16-, area z16-)
 === 3749
 
 railway-subway_entrance                             # icon z16- (also has caption(optional) z17-)
@@ -838,7 +838,7 @@ highway-living_street-bridge                        # pathtext z14- (also has li
 highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
-leisure-garden                                      # icon z16- and caption z17- (also has caption(optional) z16-, area z12-)
+leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
 leisure-swimming_pool                               # icon z17- (also has caption(optional) z17-, area z13-)
 office-diplomatic                                   # icon z17- (also has caption(optional) z17-, area z15-)
 tourism-zoo-petting                                 # icon z15- (also has caption(optional) z15-)
@@ -1396,8 +1396,8 @@ amenity-parking-private                             # icon z18- (also has captio
 amenity-parking-street_side-private                 # icon z18- (also has caption(optional) z18-, area z17-)
 amenity-parking-underground-private                 # icon z18- (also has caption(optional) z18-)
 amenity-parking_entrance-private                    # icon z19- (also has caption(optional) z19-)
-leisure-park-no-access                              # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
-leisure-park-private                                # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
+leisure-park-no-access                              # icon z14- (also has caption(optional) z14-, area z10-)
+leisure-park-private                                # icon z14- (also has caption(optional) z14-, area z10-)
 leisure-swimming_pool-private                       # icon z17- (also has caption(optional) z17-, area z13-)
 === 100
 
@@ -1434,7 +1434,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-toll_booth                                # caption(optional) z16- (also has icon z16-)
 # === -3400
 
-# historic-ruins                                    # caption(optional) z17- (also has icon z17-, caption z17-)
+# historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # === -3449
 
 # historic-castle                                   # caption(optional) z12- (also has icon z12-)
@@ -1604,13 +1604,13 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -4800
 
 # amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z13-)
-# amenity-university                                # caption(optional) z14- (also has icon z14-, caption z14-, area z13-)
+# amenity-university                                # caption(optional) z14- (also has icon z14-, area z13-)
 # leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z13-)
 # === -4900
 
 # leisure-marina                                    # caption(optional) z16- (also has icon z16-)
-# leisure-park                                      # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
-# leisure-park-permissive                           # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
+# leisure-park                                      # caption(optional) z14- (also has icon z14-, area z10-)
+# leisure-park-permissive                           # caption(optional) z14- (also has icon z14-, area z10-)
 # mountain_pass                                     # caption(optional) z15- (also has icon z14-)
 # === -4950
 
@@ -1650,11 +1650,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-gallery                                   # caption(optional) z15- (also has icon z15-)
 # === -5700
 
-# amenity-charging_station-small                    # caption(optional) z18- (also has icon z17-, area z15-)
+# amenity-charging_station-small                    # caption(optional) z16- (also has icon z15-, area z15-)
 # === -5720
 
-# amenity-charging_station-motorcar                 # caption(optional) z16- (also has icon z16-, area z15-)
-# amenity-fuel                                      # caption(optional) z15- (also has icon z15-, area z15-)
+# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
+# amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
 # === -5730
 
 # highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
@@ -1705,16 +1705,16 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # === -6200
 
-# amenity-charging_station-motorcycle               # caption(optional) z18- (also has icon z18-, area z16-)
+# amenity-charging_station-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6248
 
-# amenity-charging_station-bicycle                  # caption(optional) z18- (also has icon z18-, area z16-)
+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6249
 
-# amenity-charging_station                          # caption(optional) z18- (also has icon z18-, area z16-)
+# amenity-charging_station                          # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6250
 
-# amenity-charging_station-carless                  # caption(optional) z18- (also has icon z18-, area z16-)
+# amenity-charging_station-carless                  # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6251
 
 # railway-subway_entrance                           # caption(optional) z17- (also has icon z16-)
@@ -1934,7 +1934,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # attraction-roller_coaster                         # caption(optional) z17- (also has icon z17-)
 # landuse-plant_nursery                             # caption(optional) z17- (also has icon z17-, area z12-)
 # leisure-bowling_alley                             # caption(optional) z17- (also has icon z17-)
-# leisure-garden                                    # caption(optional) z16- (also has icon z16-, caption z17-, area z12-)
+# leisure-garden                                    # caption(optional) z16- (also has icon z16-, area z12-)
 # leisure-swimming_pool                             # caption(optional) z17- (also has icon z17-, area z13-)
 # office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # tourism-zoo-petting                               # caption(optional) z15- (also has icon z15-)
@@ -2394,8 +2394,8 @@ xmas-tree                                           # icon z18-
 # amenity-parking-street_side-private               # caption(optional) z18- (also has icon z18-, area z17-)
 # amenity-parking-underground-private               # caption(optional) z18- (also has icon z18-)
 # amenity-parking_entrance-private                  # caption(optional) z19- (also has icon z19-)
-# leisure-park-no-access                            # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
-# leisure-park-private                              # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
+# leisure-park-no-access                            # caption(optional) z14- (also has icon z14-, area z10-)
+# leisure-park-private                              # caption(optional) z14- (also has icon z14-, area z10-)
 # leisure-swimming_pool-private                     # caption(optional) z17- (also has icon z17-, area z13-)
 # === -9900
 

data/styles/default/light/style.mapcss

@@ -1,9 +1,134 @@
 @import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("dynamic_colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
+colors
+{
+  GuiText-color: #4D4D4D;
+  GuiText-opacity: 0.86;
+  MyPositionAccuracy-color: #000000;
+  MyPositionAccuracy-opacity: 0.08;
+  Selection-color: #1E96F0;
+  Selection-opacity: 0.64;
+  Route-color: #0087FF;
+  RouteOutline-color: #055FCD;
+  RouteTrafficG0-color: #9B2300;
+  RouteTrafficG1-color: #E82705;
+  RouteTrafficG2-color: #E82705;
+  RouteTrafficG3-color: #FFE500;
+  RouteTrafficG3-opacity: 0.0;
+  RoutePedestrian-color: #1D339E;
+  RoutePedestrian-opacity: 0.8;
+  RouteBicycle-color: #9C27B0;
+  RouteBicycle-opacity: 0.8;
+  RouteRuler-color: #66347F;
+  RouteRuler-opacity: 0.9;
+  RoutePreview-color: #000000;
+  RoutePreview-opacity: 0.3;
+  RouteMaskCar-color: #000000;
+  RouteMaskCar-opacity: 0.3;
+  RouteFirstSegmentArrowsMaskCar-color: #033B80;
+  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
+  RouteArrowsMaskCar-color: #033B80;
+  RouteArrowsMaskCar-opacity: 0.2;
+  RouteMaskBicycle-color: #000000;
+  RouteMaskBicycle-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskBicycle-color: #9C27B0;
+  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
+  RouteArrowsMaskBicycle-color: #9C27B0;
+  RouteArrowsMaskBicycle-opacity: 0.2;
+  RouteMaskPedestrian-color: #000000;
+  RouteMaskPedestrian-opacity: 0.5;
+  RouteFake-color: #A8A8A8;
+  RouteFakeOutline-color: #717171;
+  Arrow3D-color: #50AAFF;
+  Arrow3DObsolete-color: #82AAC8;
+  Arrow3DObsolete-opacity: 0.72;
+  Arrow3DShadow-color: #3C3C3C;
+  Arrow3DShadow-opacity: 0.24;
+  Arrow3DOutline-color: #FFFFFF;
+  TrackHumanSpeed-color: #1D339E;
+  TrackCarSpeed-color: #7C8EDE;
+  TrackPlaneSpeed-color: #A8B7ED;
+  TrackUnknownDistance-color: #616161;
+  TrafficG0-color: #7E1712;
+  TrafficG1-color: #E42300;
+  TrafficG2-color: #E42300;
+  TrafficG3-color: #FCDE00;
+  TrafficG3-opacity: 0.0;
+  TrafficG4-color: #39962E;
+  TrafficG5-color: #39962E;
+  TrafficTempBlock-color: #525252;
+  TrafficUnknown-color: #000000;
+  TrafficArrowLight-color: #FFFFFF;
+  TrafficArrowDark-color: #473635;
+  TrafficOutline-color: #E8E6DC;
+  RoadShieldBlackText-color: #000000;
+  RoadShieldWhiteText-color: #FFFFFF;
+  RoadShieldUKYellowText-color: #FFD400;
+  RoadShieldWhiteBackground-color: #FFFFFF;
+  RoadShieldGreenBackground-color: #309302;
+  RoadShieldBlueBackground-color: #1A5EC1;
+  RoadShieldRedBackground-color: #E63534;
+  RoadShieldOrangeBackground-color: #FFBE00;
+  PoiHotelTextOutline-color: #FFFFFF;
+  PoiHotelTextOutline-opacity: 0.6;
+  PoiDeletedMask-color: #FFFFFF;
+  PoiDeletedMask-opacity: 0.3;
+  PoiVisitedMask-color: #FFFFFF;
+  PoiVisitedMask-opacity: 0.7;
+  DefaultTrackColor-color: #1E96F0;
+  RouteMarkPrimaryText-color: #000000;
+  RouteMarkPrimaryTextOutline-color: #FFFFFF;
+  RouteMarkSecondaryText-color: #000000;
+  RouteMarkSecondaryTextOutline-color: #FFFFFF;
+  TransitMarkPrimaryText-color: #000000;
+  TransitMarkPrimaryTextOutline-color: #FFFFFF;
+  TransitMarkSecondaryText-color: #000000;
+  TransitMarkSecondaryTextOutline-color: #FFFFFF;
+  TransitTransferOuterMarker-color: #000000;
+  TransitTransferInnerMarker-color: #FFFFFF;
+  TransitStopInnerMarker-color: #FFFFFF;
+  LocalAdsPrimaryText-color: #000000;
+  LocalAdsPrimaryTextOutline-color: #FFFFFF;
+  LocalAdsSecondaryText-color: #000000;
+  LocalAdsSecondaryTextOutline-color: #FFFFFF;
+  TransitBackground-color: #FFFFFF;
+  TransitBackground-opacity: 0.4;
+  BookmarkRed-color: #E51B23;
+  BookmarkPink-color: #FF4182;
+  BookmarkPurple-color: #9B24B2;
+  BookmarkDeepPurple-color: #6639BF;
+  BookmarkBlue-color: #0066CC;
+  BookmarkLightBlue-color: #249CF2;
+  BookmarkCyan-color: #14BECD;
+  BookmarkTeal-color: #00A58C;
+  BookmarkGreen-color: #3C8C3C;
+  BookmarkLime-color: #93BF39;
+  BookmarkYellow-color: #FFC800;
+  BookmarkOrange-color: #FF9600;
+  BookmarkDeepOrange-color: #F06432;
+  BookmarkBrown-color: #804633;
+  BookmarkGray-color: #737373;
+  BookmarkBlueGray-color: #597380;
+  SearchmarkPreparing-color: #597380;
+  SearchmarkNotAvailable-color: #597380;
+  SearchmarkSelectedNotAvailable-color: #F06432;
+  RatingBad-color: #F06432;
+  RatingGood-color: #3C8C3C;
+  RatingNone-color: #249CF2;
+  SearchmarkDefault-color: #249CF2;
+  RatingText-color: #FFFFFF;
+  UGCRatingText-color: #000000;
+  SpeedCameraMarkText-color: #FFFFFF;
+  SpeedCameraMarkBg-color: #F51E30;
+  SpeedCameraMarkOutline-color: #FFFFFF;
+  GuideCityMarkText-color: #6639BF;
+  GuideOutdoorMarkText-color: #3C8C3C;
+  HotelPriceText-color: #000000;
+}

data/styles/default/light/symbols/subway-vienna-m.svg

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xml:space="preserve" 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="#1267CE"/><path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#fff"/></svg>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xml:space="preserve" 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="#3b87c9"/><path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#fff"/></svg>

data/styles/default/light/symbols/subway-vienna-s.svg

@@ -2,7 +2,7 @@
 <svg width="14" height="14" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <g stroke-width=".75">
   <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
-  <circle cx="9" cy="9" r="8.25" fill="#1267CE"/>
+  <circle cx="9" cy="9" r="8.25" fill="#3b87c9"/>
   <path d="m9 14.356c-2 0-4.5-1.3557-4.5-4.6057v-5.2722h3v5.1972c0 0.49565 0.5 1.425 1.5 1.425 1 0 1.5-0.75896 1.5-1.35v-5.2722h3v5.1222c0 3.4-2.5 4.7557-4.5 4.7557z" fill="#fff"/>
  </g>
 </svg>

data/styles/driving/dark/colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/dark/colors.mapcss");

data/styles/driving/dark/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");

data/styles/driving/include/basemap.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");

data/styles/driving/include/basemap_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");

data/styles/driving/include/icons.mapcss

@@ -1,53 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");
-
-/* 7. CAR */
-
-node|z14-[amenity=fuel],
-node|z15-[amenity=charging_station][motorcar?][!capacity],
-node|z15-[amenity=charging_station][motorcar?][capacity=1],
-node|z15-[amenity=charging_station][motorcar?][capacity=2],
-node|z14-[amenity=charging_station][motorcar?][capacity?],
-node|z16-[amenity=charging_station],
-{text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
-
-node|z14[amenity=fuel],
-{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;}
-node|z15[amenity=fuel],
-{icon-image: fuel-m.svg; icon-min-distance: 20;}
-node|z16[amenity=fuel],
-{icon-image: fuel-m.svg; icon-min-distance: 10;}
-node|z17-[amenity=fuel],
-{icon-image: fuel-m.svg;}
-node|z18-[amenity=fuel],
-{font-size: 11;}
-
-node|z15-[amenity=charging_station][motorcar?],
-node|z16-[amenity=charging_station][motorcycle?],
-node|z16-[amenity=charging_station][bicycle?],
-node|z16-[amenity=charging_station][motorcar=not],
-node|z16-[amenity=charging_station],
-{icon-image: charging_station-small-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging_station-s.svg;}
-node|z15-[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging_station-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?][!capacity],
-node|z14[amenity=charging_station][motorcar?][capacity=1],
-node|z14[amenity=charging_station][motorcar?][capacity=2],
-{icon-image: none;}
-node|z15-[amenity=charging_station][motorcar?][!capacity],
-node|z15-[amenity=charging_station][motorcar?][capacity=1],
-node|z15-[amenity=charging_station][motorcar?][capacity=2],
-{icon-image: charging_station-small-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?],
-{text-offset: 1;font-size: 10;icon-min-distance: 20;}
-node|z15[amenity=charging_station][motorcar?],
-{icon-min-distance: 20;}
-node|z16[amenity=charging_station],
-{icon-min-distance: 10;}
-node|z18-[amenity=charging_station],
-{font-size: 11;}

data/styles/driving/include/icons_label_colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");

data/styles/driving/include/priorities_1_BG-by-size.prio.txt

@@ -1 +0,0 @@
-@import("../../default/include/priorities_1_BG-by-size.prio.txt")

data/styles/driving/include/priorities_2_BG-top.prio.txt

@@ -1 +0,0 @@
-@import("../../default/include/priorities_2_BG-top.prio.txt")

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

@@ -1 +0,0 @@
-@import("../../default/include/priorities_3_FG.prio.txt")

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

@@ -1 +0,0 @@
-@import("../../default/include/priorities_4_overlays.prio.txt")

data/styles/driving/include/transit_systems.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/transit_systems.mapcss");

data/styles/driving/include/ways.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");

data/styles/driving/include/ways_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");

data/styles/driving/light/colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/light/colors.mapcss");

data/styles/driving/light/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("../../default/light/dynamic_colors.mapcss");

data/styles/hiking/dark/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");

data/styles/hiking/include/icons_label_colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");

data/styles/hiking/include/priorities_1_BG-by-size.prio.txt

@@ -1,4 +0,0 @@
-@import("../../default/include/priorities_1_BG-by-size.prio.txt")
-
-amenity-courthouse
-=== 180

data/styles/hiking/include/priorities_2_BG-top.prio.txt

@@ -1 +0,0 @@
-@import("../../default/include/priorities_2_BG-top.prio.txt")

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

@@ -1,16 +0,0 @@
-@import("../../default/include/priorities_3_FG.prio.txt")
-
-power-minor_line
-=== 350
-
-power-minor_line::dash
-=== 340
-
-piste:type-downhill-advanced-area                   # area z13-
-piste:type-downhill-area                            # area z13-
-piste:type-downhill-easy-area                       # area z13-
-piste:type-downhill-expert-area                     # area z13-
-piste:type-downhill-intermediate-area               # area z13-
-piste:type-downhill-novice-area                     # area z13-
-piste:type-sled-area                                # area z13-
-=== 15

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

@@ -1,8 +0,0 @@
-@import("../../default/include/priorities_4_overlays.prio.txt")
-
-power-line
-=== 1000
-
-man_made-utility_pole
-power-pole
-=== 230

data/styles/hiking/include/transit_systems.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/transit_systems.mapcss");

data/styles/hiking/light/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("../../default/light/dynamic_colors.mapcss");

data/styles/outdoors/dark/style.mapcss

@@ -1,3 +1,12 @@
+@import("colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
 colors
 {
   GuiText-color: #FFFFFF;
@@ -104,8 +113,8 @@ colors
   BookmarkYellow-color: #FFC800;
   BookmarkOrange-color: #FF9600;
   BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #8C4E39;
-  BookmarkGray-color: #808080;
+  BookmarkBrown-color: #804633;
+  BookmarkGray-color: #737373;
   BookmarkBlueGray-color: #597380;
   SearchmarkPreparing-color: #597380;
   SearchmarkNotAvailable-color: #597380;

data/styles/outdoors/include/Basemap.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");
+@import("../../default/include/Basemap.mapcss");
 
 
 /* 6.WATER */

data/styles/outdoors/include/Basemap_label.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");
+@import("../../default/include/Basemap_label.mapcss");
 
 /* Barriers, cliffs */
 

data/styles/outdoors/include/Icons.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");
+@import("../../default/include/Icons.mapcss");
 
 
 /* 2. NATURAL */

data/styles/outdoors/include/Roads.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");
+@import("../../default/include/Roads.mapcss");
 
 
 /* Make all roads more contrast */

data/styles/outdoors/include/Roads_label.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");
+@import("../../default/include/Roads_label.mapcss");
 
 
 line|z13-[highway=track],

data/styles/outdoors/include/Subways.mapcss

@@ -1,2 +1,2 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/dark/colors.mapcss");
+@import("../../default/include/Subways.mapcss");

data/styles/outdoors/include/defaults_new.mapcss

@@ -0,0 +1,24 @@
+way|z1-12::*
+{
+  linejoin: bevel;
+}
+
+way|z13-::*
+{
+  linejoin: round;
+}
+
+way|z1-15::*
+{
+  linecap: butt;
+}
+
+way|z16-::*
+{
+  linecap: round;
+}
+
+*::int_name
+{
+  text-offset: 1;
+}

data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt

@@ -0,0 +1,258 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# BG-by-size geometry: background areas rendered below BG-top and everything else.
+# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box).
+# So effectively priority values of BG-by-size areas are not used at the moment.
+# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature.
+# Keep them in a logical importance order please.
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
+=== 250
+
+amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-religious                                   # area z13-
+=== 240
+
+amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
+leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
+=== 230
+
+landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
+=== 220
+
+leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
+=== 200
+
+amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
+leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
+leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
+leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
+=== 190
+
+amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-grave_yard                                  # area z10- (also has icon z17-, caption(optional) z17-)
+amenity-grave_yard-christian                        # area z10- (also has icon z17-, caption(optional) z17-)
+landuse-cemetery                                    # area z10- (also has icon z14-, caption(optional) z15-)
+landuse-cemetery-christian                          # area z10- (also has icon z14-, caption(optional) z15-)
+=== 180
+
+amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
+amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
+amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
+amenity-ranger_station                              # area z13- (also has icon z13-, caption(optional) z14-)
+amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
+emergency-mountain_rescue                           # area z13- (also has icon z12-, caption(optional) z12-)
+highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
+highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z15-)
+highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-garages                                     # area z13- (also has caption z15-)
+leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
+leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
+office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
+tourism-camp_site                                   # area z13- (also has icon z13-, caption(optional) z13-)
+tourism-information-office                          # area z15- (also has icon z13-, caption(optional) z14-)
+tourism-information-visitor_centre                  # area z13- (also has icon z13-, caption(optional) z14-)
+=== 170
+
+highway-footway-area                                # area z14- (also has line z11-, pathtext z13-)
+leisure-track-area                                  # area z15- (also has caption z16-)
+=== 160
+
+aeroway-terminal                                    # area z14- (also has caption z15-)
+=== 150
+
+leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
+leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
+=== 140
+
+landuse-flowerbed                                   # area z16-
+natural-scrub                                       # area z11-
+=== 130
+
+landuse-grass                                       # area z11-
+natural-grassland                                   # area z11-
+natural-heath                                       # area z11-
+=== 120
+
+area:highway-footway                                # area z14- (also has caption z15-)
+area:highway-living_street                          # area z14-
+area:highway-pedestrian                             # area z14- (also has caption z15-)
+public_transport-platform                           # area z16- (also has caption z17-)
+railway-platform                                    # area z16- (also has caption z16-)
+=== 110
+
+amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-lane-fee                            # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-lane-private                        # area z17- (also has icon z19-, caption(optional) z19-)
+amenity-parking-multi-storey                        # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-multi-storey-fee                    # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-no-access                           # area z15- (also has icon z18-, caption(optional) z18-)
+amenity-parking-park_and_ride                       # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-permissive                          # area z15- (also has icon z16-, caption(optional) z18-)
+amenity-parking-private                             # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
+=== 100
+
+natural-wetland                                     # area z11- (also has caption z16-)
+natural-wetland-bog                                 # area z11- (also has caption z16-)
+natural-wetland-fen                                 # area z11- (also has caption z16-)
+natural-wetland-mangrove                            # area z11- (also has caption z16-)
+natural-wetland-marsh                               # area z11- (also has caption z16-)
+natural-wetland-reedbed                             # area z11- (also has caption z16-)
+natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
+natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
+natural-wetland-swamp                               # area z11- (also has caption z16-)
+natural-wetland-tidalflat                           # area z11- (also has caption z16-)
+=== 90
+
+landuse-farmyard                                    # area z10- (also has caption z15-)
+=== 81
+
+landuse-allotments                                  # area z12- (also has caption z15-)
+landuse-farmland                                    # area z10- (also has caption z15-)
+landuse-meadow                                      # area z11-
+landuse-orchard                                     # area z12- (also has caption z15-)
+landuse-recreation_ground                           # area z12- (also has caption z15-)
+landuse-village_green                               # area z12-
+landuse-vineyard                                    # area z12- (also has caption z15-)
+leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
+natural-bare_rock                                   # area z11- (also has caption z13-)
+natural-scree                                       # area z11-
+natural-shingle                                     # area z12-
+=== 80
+
+landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
+leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
+leisure-garden-residential                          # area z12-
+leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
+=== 70
+
+landuse-forest                                      # area z10- (also has icon z12-, caption(optional) z13-)
+landuse-forest-coniferous                           # area z10- (also has icon z12-, caption(optional) z13-)
+landuse-forest-deciduous                            # area z10- (also has icon z12-, caption(optional) z13-)
+landuse-forest-mixed                                # area z10- (also has icon z12-, caption(optional) z13-)
+=== 60
+
+amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
+landuse-construction                                # area z13- (also has caption z15-)
+landuse-industrial                                  # area z13- (also has caption z15-)
+landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-railway                                     # area z13- (also has caption z15-)
+man_made-wastewater_plant                           # area z13- (also has caption z15-)
+man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
+power-generator                                     # area z13- (also has icon z17-)
+power-generator-gas                                 # area z13- (also has icon z17-)
+power-generator-hydro                               # area z13- (also has icon z17-)
+power-generator-solar                               # area z13-
+power-generator-wind                                # area z13- (also has icon z13-, caption(optional) z16-)
+power-plant                                         # area z13- (also has icon z17-)
+power-plant-coal                                    # area z13- (also has icon z17-)
+power-plant-gas                                     # area z13- (also has icon z17-)
+power-plant-hydro                                   # area z13- (also has icon z17-)
+power-plant-solar                                   # area z13- (also has icon z17-)
+power-plant-wind                                    # area z13- (also has icon z13-, caption(optional) z16-)
+power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
+=== 50
+
+amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
+amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
+=== 40
+
+aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
+aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
+landuse-education                                   # area z13-
+landuse-retail                                      # area z13- (also has caption z16-)
+leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
+natural-beach                                       # area z10- (also has caption z14-)
+natural-beach-gravel                                # area z10- (also has caption z14-)
+natural-beach-sand                                  # area z10- (also has caption z14-)
+natural-desert                                      # area z1- (also has caption z14-)
+natural-glacier                                     # area z1-
+natural-sand                                        # area z1- (also has caption z15-)
+=== 30
+
+natural-land                                        # area z1-
+place-islet                                         # area z10- (also has caption z14-)
+=== 20
+
+natural-coastline                                   # area z1-
+=== 10

data/styles/outdoors/include/priorities_2_BG-top.prio.txt

@@ -0,0 +1,46 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# BG-top geometry: background lines and areas that should be always below foreground ones
+# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size),
+# because ordering by size doesn't always work with e.g. water mapped over a forest,
+# so water should be on top of other landcover always, but linear waterways should be hidden beneath it.
+# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature
+# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas
+# are displayed above layer=0 BG-top.
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+landuse-basin                                       # area z12-
+landuse-reservoir                                   # area z12- (also has caption z10-)
+landuse-salt_pond                                   # area z1-
+natural-water                                       # area z1- (also has caption z10-)
+natural-water-basin                                 # area z1- (also has caption z10-)
+natural-water-ditch                                 # area z13- (also has caption z17-)
+natural-water-drain                                 # area z13- (also has caption z17-)
+natural-water-lake                                  # area z1- (also has caption z10-)
+natural-water-lock                                  # area z1- (also has caption z10-)
+natural-water-moat                                  # area z1- (also has caption z17-)
+natural-water-pond                                  # area z1- (also has caption z10-)
+natural-water-reservoir                             # area z1- (also has caption z10-)
+natural-water-river                                 # area z1- (also has caption z10-)
+natural-water-tunnel                                # area z15-
+natural-water-wastewater                            # area z12- (also has caption z17-)
+waterway-dock                                       # area z1-
+=== 20
+
+natural-strait                                      # line z11- (also has caption z13-)
+waterway-canal                                      # line z12- (also has pathtext z13-)
+waterway-ditch                                      # line z13-
+waterway-drain                                      # line z13-
+waterway-fish_pass                                  # line z13- (also has pathtext z13-)
+waterway-river                                      # line z10- (also has pathtext z11-)
+waterway-stream                                     # line z12- (also has pathtext z13-)
+waterway-stream-ephemeral                           # line z13- (also has pathtext z13-)
+waterway-stream-intermittent                        # line z13- (also has pathtext z13-)
+=== 10

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

@@ -0,0 +1,490 @@
+# This file is automatically re-formatted and re-sorted in priorities descending order
+# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
+# are generated automatically for information only. Custom formatting and comments are not preserved.
+#
+# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays
+# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature
+# is layer=-10 (as tunnels should be visibile over landcover and water).
+#
+# Priorities ranges' rendering order overview:
+# - overlays (icons, captions...)
+# - FG: foreground areas and lines
+# - BG-top: water (linear and areal)
+# - BG-by-size: landcover areas sorted by their size
+
+aerialway-cable_car::dash                           # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-chair_lift::dash                          # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-drag_lift::dash                           # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-gondola::dash                             # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-j-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-magic_carpet::dash                        # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-mixed_lift::dash                          # line::dash z12- (also has line z12-, pathtext z15-)
+aerialway-platter::dash                             # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-rope_tow::dash                            # line::dash z13- (also has line z13-, pathtext z15-)
+aerialway-t-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
+=== 380
+
+aerialway-cable_car                                 # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-chair_lift                                # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-drag_lift                                 # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-gondola                                   # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-j-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-magic_carpet                              # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-mixed_lift                                # line z12- (also has line::dash z12-, pathtext z15-)
+aerialway-platter                                   # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-rope_tow                                  # line z13- (also has line::dash z13-, pathtext z15-)
+aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
+=== 370
+
+historic-citywalls                                  # line z14- (also has pathtext z16-)
+=== 360
+
+power-line                                          # line z13- (also has line::dash z13-, pathtext z15-)
+power-minor_line                                    # line z15- (also has line::dash z15-)
+=== 350
+
+power-line::dash                                    # line::dash z13- (also has line z13-, pathtext z15-)
+power-minor_line::dash                              # line::dash z15- (also has line z15-)
+=== 340
+
+highway-ladder                                      # line z12- (also has icon z16-, pathtext z17-)
+highway-steps                                       # line z12- (also has pathtext z13-)
+highway-steps-bridge                                # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-steps-tunnel                                # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+hwtag-oneway::arrows                                # line::arrows z15-
+waterway-weir                                       # line z14- (also has pathtext z15-)
+=== 330
+
+barrier-city_wall                                   # line z14- (also has pathtext z16-)
+barrier-fence                                       # line z15-
+barrier-guard_rail                                  # line z16-
+barrier-hedge                                       # line z16-
+barrier-wall                                        # line z15-
+barrier-yes                                         # line z15- (also has icon z16-, caption(optional) z16-)
+railway-funicular                                   # line z12-
+railway-funicular-bridge                            # line z12-
+railway-funicular-tunnel                            # line z12-
+railway-monorail                                    # line z14-
+railway-monorail-bridge                             # line z14-
+railway-monorail-tunnel                             # line z14-
+railway-narrow_gauge                                # line z15-
+railway-narrow_gauge-bridge                         # line z15-
+railway-narrow_gauge-tunnel                         # line z15-
+railway-tram                                        # line z13-
+railway-tram-bridge                                 # line z13-
+railway-tram-tunnel                                 # line z13-
+=== 320
+
+highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-world_level                                 # line z4-9
+highway-world_towns_level                           # line z6-9
+=== 310
+
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# === 309
+
+highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+railway-rail-branch::dash                           # line::dash z15- (also has line z10-)
+railway-rail-branch-bridge::dash                    # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-branch-tunnel::dash                    # line::dash z15- (also has line z10-, line(casing) z14-)
+railway-rail-highspeed::dash                        # line::dash z15- (also has line z10-)
+railway-rail-highspeed-bridge::dash                 # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-highspeed-tunnel::dash                 # line::dash z15- (also has line z10-, line(casing) z14-)
+railway-rail-main::dash                             # line::dash z15- (also has line z10-)
+railway-rail-main-bridge::dash                      # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-main-tunnel::dash                      # line::dash z15- (also has line z10-, line(casing) z14-)
+railway-rail-tourism::dash                          # line::dash z15- (also has line z10-, pathtext z14-)
+railway-rail-tourism-bridge::dash                   # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-)
+railway-rail-tourism-tunnel::dash                   # line::dash z15- (also has line z10-, line(casing) z14-, pathtext z14-)
+=== 290
+
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
+# === 289
+
+railway-rail-branch                                 # line z10- (also has line::dash z15-)
+railway-rail-branch-bridge                          # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-)
+railway-rail-branch-tunnel                          # line z10- (also has line::dash z15-, line(casing) z14-)
+railway-rail-highspeed                              # line z10- (also has line::dash z15-)
+railway-rail-highspeed-bridge                       # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-)
+railway-rail-highspeed-tunnel                       # line z10- (also has line::dash z15-, line(casing) z14-)
+railway-rail-main                                   # line z10- (also has line::dash z15-)
+railway-rail-main-bridge                            # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-)
+railway-rail-main-tunnel                            # line z10- (also has line::dash z15-, line(casing) z14-)
+railway-rail-tourism                                # line z10- (also has line::dash z15-, pathtext z14-)
+railway-rail-tourism-bridge                         # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-, pathtext z14-)
+railway-rail-tourism-tunnel                         # line z10- (also has line::dash z15-, line(casing) z14-, pathtext z14-)
+=== 280
+
+# railway-rail-branch-tunnel                        # line(casing) z14- (also has line z10-, line::dash z15-)
+# railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z15-)
+# railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z15-)
+# railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z15-, pathtext z14-)
+# === 279
+
+highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
+=== 270
+
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
+# === 269
+
+highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has pathtext z13-)
+highway-unclassified-area                           # line z11- (also has pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
+=== 250
+
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
+# === 249
+
+highway-living_street                               # line z12- (also has pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has pathtext z14-)
+=== 230
+
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
+# === 229
+
+highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+=== 228
+
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# === 227
+
+highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
+=== 226
+
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
+# === 225
+
+highway-secondary_link                              # line z13- (also has pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
+=== 224
+
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
+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 line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
+highway-service                                     # line z13- (also has pathtext z16-)
+highway-service-area                                # line z13- (also has pathtext z16-)
+highway-service-bridge                              # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, 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 z13- (also has line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
+=== 222
+
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z13-, pathtext z16-)
+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 z15- (also has line z10-)
+railway-rail-bridge::dash                           # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-service::dash                          # line::dash z16- (also has line z15-)
+railway-rail-service-bridge::dash                   # line::dash z16- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-)
+railway-rail-service-tunnel::dash                   # line::dash z16- (also has line(casing) z15-, line z15-)
+railway-rail-spur::dash                             # line::dash z16- (also has line z14-)
+railway-rail-spur-bridge::dash                      # line::dash z16- (also has line z14-, line::bridgeblack z16-, line::bridgewhite z14-)
+railway-rail-spur-tunnel::dash                      # line::dash z16- (also has line(casing) z14-, line z14-)
+railway-rail-tunnel::dash                           # line::dash z15- (also has line z10-, line(casing) z14-)
+railway-rail-utility::dash                          # line::dash z16- (also has line z12-)
+railway-rail-utility-bridge::dash                   # line::dash z16- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z13-)
+railway-rail-utility-tunnel::dash                   # line::dash z16- (also has line z12-, 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 z11- (also has line::cycleline z13-, pathtext z13-)
+highway-path-bicycle                                # line z11- (also has line::cycleline z12-, pathtext z13-)
+=== 220
+
+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-)
+=== 219
+
+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-)
+=== 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 z10- (also has line::dash z15-)
+railway-rail-bridge                                 # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-)
+railway-rail-service                                # line z15- (also has line::dash z16-)
+railway-rail-service-bridge                         # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z16-)
+railway-rail-service-tunnel                         # line z15- (also has line(casing) z15-, line::dash z16-)
+railway-rail-spur                                   # line z14- (also has line::dash z16-)
+railway-rail-spur-bridge                            # line z14- (also has line::bridgeblack z16-, line::bridgewhite z14-, line::dash z16-)
+railway-rail-spur-tunnel                            # line z14- (also has line(casing) z14-, line::dash z16-)
+railway-rail-tunnel                                 # line z10- (also has line::dash z15-, line(casing) z14-)
+railway-rail-utility                                # line z12- (also has line::dash z16-)
+railway-rail-utility-bridge                         # line z12- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+railway-rail-utility-tunnel                         # line z12- (also has line::dash z16-, line(casing) z14-)
+railway-subway                                      # line z13- (also has line::dash z16-)
+railway-subway-bridge                               # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
+=== 210
+
+# railway-rail-service-tunnel                       # line(casing) z15- (also has line z15-, line::dash z16-)
+# railway-rail-spur-tunnel                          # line(casing) z14- (also has line z14-, line::dash z16-)
+# railway-rail-tunnel                               # line(casing) z14- (also has line z10-, line::dash z15-)
+# railway-rail-utility-tunnel                       # line(casing) z14- (also has line z12-, line::dash z16-)
+# === 209
+
+highway-ford                                        # line z13- (also has icon z14-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
+=== 200
+
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
+# === 199
+
+highway-bridleway                                   # line z11- (also has pathtext z13-)
+highway-bridleway-bridge                            # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+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-crossing                            # line z16-
+highway-path                                        # line z11- (also has 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-)
+highway-track                                       # line z11- (also has pathtext z13-)
+highway-track-area                                  # line z11- (also has pathtext z13-)
+highway-track-bridge                                # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-track-no-access                             # line z11- (also has pathtext z13-)
+highway-track-tunnel                                # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+=== 180
+
+highway-construction                                # line z11- (also has pathtext z15-)
+leisure-track                                       # line z15- (also has caption z16-)
+railway-abandoned                                   # line z13-
+railway-construction                                # line z13-
+railway-disused                                     # line z13-
+railway-disused-bridge                              # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-disused-tunnel                              # line z13-
+railway-miniature                                   # line z13-
+railway-miniature-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-miniature-tunnel                            # line z13-
+railway-preserved                                   # line z13-
+railway-preserved-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z15-)
+railway-preserved-tunnel                            # line z13-
+railway-turntable                                   # line z17-
+=== 160
+
+highway-footway-bridge                              # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-footway-sidewalk                            # line z13-
+highway-footway-tunnel                              # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+highway-path-bridge                                 # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-path-horse                                  # line z11- (also has pathtext z13-)
+highway-path-tunnel                                 # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+=== 155
+
+highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
+highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
+highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-)
+highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
+=== 154
+
+highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
+highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
+highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-)
+highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
+=== 153
+
+highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z13-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
+highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
+railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
+railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
+railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-)
+railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-)
+railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-)
+railway-rail-highspeed-bridge::bridgewhite          # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-)
+railway-rail-main-bridge::bridgewhite               # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-)
+railway-rail-service-bridge::bridgewhite            # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z14- (also has line z14-, line::bridgeblack z16-, line::dash z16-)
+railway-rail-tourism-bridge::bridgewhite            # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-, pathtext z14-)
+railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z13- (also has line z12-, line::bridgeblack z16-, line::dash z16-)
+railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+=== 150
+
+highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z13-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
+highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
+railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
+railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
+railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
+railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-)
+railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-)
+railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-)
+railway-rail-highspeed-bridge::bridgeblack          # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-)
+railway-rail-main-bridge::bridgeblack               # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-)
+railway-rail-service-bridge::bridgeblack            # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z16-)
+railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (also has line z14-, line::bridgewhite z14-, line::dash z16-)
+railway-rail-tourism-bridge::bridgeblack            # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-, pathtext z14-)
+railway-rail-utility-bridge::bridgeblack            # line::bridgeblack z16- (also has line z12-, line::bridgewhite z13-, line::dash z16-)
+railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
+=== 140
+
+building                                            # area z14- (also has caption z17-)
+building-garage                                     # area z14- (also has caption z17-)
+building-guardhouse                                 # area z14- (also has icon z16-, caption(optional) z18-)
+building-has_parts                                  # area z14- (also has caption z17-)
+building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
+=== 130
+
+piste:type-connection                               # line z15-
+piste:type-downhill                                 # line z12- (also has pathtext z15-)
+piste:type-downhill-advanced                        # line z12- (also has pathtext z15-)
+piste:type-downhill-easy                            # line z12- (also has pathtext z15-)
+piste:type-downhill-expert                          # line z12- (also has pathtext z15-)
+piste:type-downhill-freeride                        # line z12- (also has pathtext z15-)
+piste:type-downhill-intermediate                    # line z12- (also has pathtext z15-)
+piste:type-downhill-novice                          # line z12- (also has pathtext z15-)
+piste:type-hike                                     # line z12- (also has pathtext z13-)
+piste:type-nordic                                   # line z12- (also has pathtext z13-)
+piste:type-skitour                                  # line z12- (also has pathtext z13-)
+piste:type-sled                                     # line z12- (also has pathtext z15-)
+=== 120
+
+building:part                                       # area z16-
+=== 110
+
+barrier-retaining_wall                              # line z16-
+man_made-embankment                                 # line z16- (also has pathtext z18-)
+natural-cliff                                       # line z12- (also has pathtext z14-)
+natural-earth_bank                                  # line z12-
+=== 100
+
+boundary-administrative-2                           # line z2-
+boundary-administrative-3                           # line z4
+boundary-administrative-4                           # line z5-
+=== 90
+
+man_made-cutline                                    # line z13-
+route-ferry                                         # line z7- (also has pathtext z10-)
+=== 80
+
+aeroway-runway                                      # line z12-
+aeroway-taxiway                                     # line z14-
+barrier-ditch                                       # line z15-
+=== 70
+
+isoline-step_10                                     # line z15- (also has pathtext z16-)
+isoline-step_100                                    # line z11- (also has pathtext z13-)
+isoline-step_1000                                   # line z10- (also has pathtext z10-)
+isoline-step_50                                     # line z13- (also has pathtext z15-)
+isoline-step_500                                    # line z10- (also has pathtext z11-)
+isoline-zero                                        # line z15- (also has pathtext z15-)
+=== 60
+
+man_made-breakwater                                 # line z14- and area z12- (also has caption z17-)
+man_made-pier                                       # line z14- and area z12- (also has caption z17-)
+waterway-dam                                        # line z14- and area z14- (also has pathtext z15-)
+=== 30
+
+landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
+landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
+=== 25
+
+amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
+boundary-aboriginal_lands                           # line z10- and area z10-16 (also has caption z10-16)
+boundary-national_park                              # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17)
+boundary-protected_area-1                           # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17)
+leisure-nature_reserve                              # area z10-17 (also has icon z10-17, caption(optional) z11-17, caption z18-)
+=== 20
+
+piste:type-downhill-advanced-area                   # area z13-
+piste:type-downhill-area                            # area z13-
+piste:type-downhill-easy-area                       # area z13-
+piste:type-downhill-expert-area                     # area z13-
+piste:type-downhill-intermediate-area               # area z13-
+piste:type-downhill-novice-area                     # area z13-
+piste:type-sled-area                                # area z13-
+piste:type-snow_park                                # area z13- (also has caption z15-)
+=== 15
+
+man_made-bridge                                     # area z14-
+=== 10

data/styles/outdoors/light/style.mapcss

@@ -1,3 +1,14 @@
+@import("colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
+/* TODO: move to a separete base file */
+
 colors
 {
   GuiText-color: #4D4D4D;

data/styles/publictransport/dark/colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/dark/colors.mapcss");

data/styles/publictransport/dark/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");

data/styles/publictransport/include/basemap.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");

data/styles/publictransport/include/basemap_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");

data/styles/publictransport/include/icons.mapcss

@@ -1,7 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");
-
-/* 3.4 Bus Station */
-
-node|z14[highway=bus_stop],
-{icon-image: bus-xvs.svg;icon-min-distance: 1;}

data/styles/publictransport/include/icons_label_colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");

data/styles/publictransport/include/priorities_1_BG-by-size.prio.txt

@@ -1 +0,0 @@
-@import("../../default/include/priorities_1_BG-by-size.prio.txt")

data/styles/publictransport/include/priorities_2_BG-top.prio.txt

@@ -1 +0,0 @@
-@import("../../default/include/priorities_2_BG-top.prio.txt")

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

@@ -1 +0,0 @@
-@import("../../default/include/priorities_3_FG.prio.txt")

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

@@ -1 +0,0 @@
-@import("../../default/include/priorities_4_overlays.prio.txt")

data/styles/publictransport/include/transit_systems.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/transit_systems.mapcss");

data/styles/publictransport/include/ways.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");

data/styles/publictransport/include/ways_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");

data/styles/publictransport/light/colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/light/colors.mapcss");

data/styles/publictransport/light/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("../../default/light/dynamic_colors.mapcss");

data/styles/vehicle/dark/style.mapcss

@@ -1,9 +1,135 @@
 @import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/transit_systems.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
+
+colors
+{
+  GuiText-color: #FFFFFF;
+  GuiText-opacity: 0.7;
+  MyPositionAccuracy-color: #FFFFFF;
+  MyPositionAccuracy-opacity: 0.06;
+  Selection-color: #FFFFFF;
+  Selection-opacity: 0.64;
+  Route-color: #0087FF;
+  RouteOutline-color: #055FCD;
+  RouteTrafficG0-color: #5E0F0D;
+  RouteTrafficG1-color: #7F1311;
+  RouteTrafficG2-color: #7F1311;
+  RouteTrafficG3-color: #9E8216;
+  RouteTrafficG3-opacity: 0.0;
+  RoutePedestrian-color: #FFB94B;
+  RoutePedestrian-opacity: 0.7;
+  RouteBicycle-color: #FF4B8C;
+  RouteBicycle-opacity: 0.7;
+  RouteRuler-color: #FFB94B;
+  RouteRuler-opacity: 0.7;
+  RoutePreview-color: #FFFFFF;
+  RoutePreview-opacity: 0.3;
+  RouteMaskCar-color: #000000;
+  RouteMaskCar-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskCar-color: #055FCD;
+  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
+  RouteArrowsMaskCar-color: #055FCD;
+  RouteArrowsMaskCar-opacity: 0.3;
+  RouteMaskBicycle-color: #000000;
+  RouteMaskBicycle-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C;
+  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
+  RouteArrowsMaskBicycle-color: #FF4B8C;
+  RouteArrowsMaskBicycle-opacity: 0.5;
+  RouteMaskPedestrian-color: #000000;
+  RouteMaskPedestrian-opacity: 0.5;
+  RouteFake-color: #A8A8A8;
+  RouteFakeOutline-color: #717171;
+  Arrow3D-color: #41C8FF;
+  Arrow3DObsolete-color: #82AAC8;
+  Arrow3DObsolete-opacity: 0.72;
+  Arrow3DShadow-color: #3C3C3C;
+  Arrow3DShadow-opacity: 0.24;
+  Arrow3DOutline-color: #FFFFFF;
+  TrackHumanSpeed-color: #FF9800;
+  TrackCarSpeed-color: #FFCA28;
+  TrackPlaneSpeed-color: #FFF5A0;
+  TrackUnknownDistance-color: #969696;
+  TrafficG0-color: #4C120F;
+  TrafficG1-color: #731816;
+  TrafficG2-color: #731816;
+  TrafficG3-color: #8C7012;
+  TrafficG3-opacity: 0.0;
+  TrafficG4-color: #376222;
+  TrafficG5-color: #376222;
+  TrafficTempBlock-color: #232323;
+  TrafficUnknown-color: #000000;
+  TrafficArrowLight-color: #AAAAAA;
+  TrafficArrowDark-color: #1E1E1E;
+  TrafficOutline-color: #383838;
+  RoadShieldBlackText-color: #212121;
+  RoadShieldWhiteText-color: #B7B6B6;
+  RoadShieldUKYellowText-color: #B49E0E;
+  RoadShieldWhiteBackground-color: #999999;
+  RoadShieldGreenBackground-color: #136C30;
+  RoadShieldBlueBackground-color: #294C88;
+  RoadShieldRedBackground-color: #9F1A17;
+  RoadShieldOrangeBackground-color: #B58E1B;
+  PoiHotelTextOutline-color: #000000;
+  PoiHotelTextOutline-opacity: 0.6;
+  PoiDeletedMask-color: #FFFFFF;
+  PoiDeletedMask-opacity: 0.3;
+  PoiVisitedMask-color: #FFFFFF;
+  PoiVisitedMask-opacity: 0.7;
+  DefaultTrackColor-color: #1E96F0;
+  RouteMarkPrimaryText-color: #888888;
+  RouteMarkPrimaryTextOutline-color: #000000;
+  RouteMarkSecondaryText-color: #888888;
+  RouteMarkSecondaryTextOutline-color: #000000;
+  TransitMarkPrimaryText-color: #888888;
+  TransitMarkPrimaryTextOutline-color: #000000;
+  TransitMarkSecondaryText-color: #888888;
+  TransitMarkSecondaryTextOutline-color: #000000;
+  TransitTransferOuterMarker-color: #000000;
+  TransitTransferInnerMarker-color: #888888;
+  TransitStopInnerMarker-color: #000000;
+  LocalAdsPrimaryText-color: #888888;
+  LocalAdsPrimaryTextOutline-color: #000000;
+  LocalAdsSecondaryText-color: #888888;
+  LocalAdsSecondaryTextOutline-color: #000000;
+  TransitBackground-color: #000000;
+  TransitBackground-opacity: 0.4;
+  BookmarkRed-color: #E51B23;
+  BookmarkPink-color: #FF4182;
+  BookmarkPurple-color: #9B24B2;
+  BookmarkDeepPurple-color: #6639BF;
+  BookmarkBlue-color: #0066CC;
+  BookmarkLightBlue-color: #249CF2;
+  BookmarkCyan-color: #14BECD;
+  BookmarkTeal-color: #00A58C;
+  BookmarkGreen-color: #3C8C3C;
+  BookmarkLime-color: #93BF39;
+  BookmarkYellow-color: #FFC800;
+  BookmarkOrange-color: #FF9600;
+  BookmarkDeepOrange-color: #F06432;
+  BookmarkBrown-color: #737373;
+  BookmarkGray-color: #808080;
+  BookmarkBlueGray-color: #597380;
+  SearchmarkPreparing-color: #597380;
+  SearchmarkNotAvailable-color: #597380;
+  SearchmarkSelectedNotAvailable-color: #F06432;
+  RatingBad-color: #F06432;
+  RatingGood-color: #3C8C3C;
+  RatingNone-color: #249CF2;
+  SearchmarkDefault-color: #249CF2;
+  RatingText-color: #FFFFFF;
+  UGCRatingText-color: #B8B8B8;
+  SpeedCameraMarkText-color: #FFFFFF;
+  SpeedCameraMarkBg-color: #F51E30;
+  SpeedCameraMarkOutline-color: #FFFFFF;
+  GuideCityMarkText-color: #6639BF;
+  GuideOutdoorMarkText-color: #3C8C3C;
+  HotelPriceText-color: #000000;
+}

data/styles/vehicle/include/Icons.mapcss

@@ -85,10 +85,10 @@ node|z17-[railway=tram_stop]::int_name,
 
 node|z10-[aeroway=aerodrome][aerodrome=international],
 node|z14-[aeroway=aerodrome],
-{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center; text-offset: 1;}
+{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
 node|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
 node|z14-[aeroway=aerodrome]::int_name,
-{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center; text-offset: 1;}
+{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
 
 /* 3.1 Train Station */
 
@@ -804,4 +804,8 @@ node|z19-[amenity=parking_entrance][access=private],
 {icon-image: parking_entrance_private-m.svg; font-size: 12.5;}
 
 node|z17-[amenity=motorcycle_parking],
-{icon-image: motorcycle-parking-m.svg;}
+{icon-image: motorcycle-parking-m.svg;}
+
+/* 8. Colored Labels */
+
+@import("../../default/include/Icons_Label_Colors.mapcss");

data/styles/vehicle/include/Subways.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/transit_systems.mapcss");
+@import("../../default/include/Subways.mapcss");
 
 
 /*only render captions from z16*/